git-svn-id: https://192.168.57.71/svn/jsgkj@861 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js

@@ -387,8 +387,10 @@ xkzxx.detail.delFj = function(data,flag){
 	                     $("#fjxq"+flag).empty();
 	                     if(flag==1){
 	                    	 $("#fzzm").removeAttr("style");
+	                    	 $('#zmpicid').val("");
 	                     }else if(flag==2){
 	                    	 $("#fzfm").removeAttr("style");
+	                    	 $('#fmpicid').val("");
 	                     }	                     
 	 	                 $("#delid"+flag).val("");
 		                 } else {

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java

@@ -8,7 +8,6 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeanUtils;
@@ -26,7 +25,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
-import com.xt.jygl.common.Utils;
 import com.xt.jygl.gkjcxx.gk.client.GkWebService;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
@@ -92,19 +90,6 @@ public class GkCtl extends BaseWebCtl {
 					//list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + SearchCondition.gkssgkglbm + "%"));
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "ssgkglbm");
 				}
-				if (isJyr()) {
-					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
-				} else {
-					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
-					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
-					if (gqlist != null && gqlist.size() > 0) {
-						for (int i = 0; i < gqlist.size(); i++) {
-							in.value(gqlist.get(i));
-						}
-						list.add(in);
-					}
-				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java

@@ -93,7 +93,7 @@ public class JghdCtl extends BaseWebCtl {
 				if (isJyr()) {
 					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
-					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					In<String> in = cb.in(root.get("szgq").as(String.class));
 					@SuppressWarnings("unchecked")
 					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java

@@ -111,7 +111,7 @@ public class MdCtl extends BaseWebCtl {
 				if (isJyr()) {
 					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
-					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					In<String> in = cb.in(root.get("szgq").as(String.class));
 					@SuppressWarnings("unchecked")
 					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {