Merge

com.awspaas.user.apps.donenow_crm/src/com/awspaas/user/apps/donenow_crm/controller/accountController.java

@@ -312,6 +312,8 @@ public class accountController extends BaseController {
             sql = verify.getString("SEL_SQL");
             for (String id : ids.split(",")) {
                 id = DBSql.getString("select ID from " + tableName + " where ID=?", new Object[]{id});
+                if (StringUtils.isBlank(id) || id.length() < 2)
+                    continue;
                 String sqlById = sql.replace("**id**", "'" + id + "'");
                 List<RowMap> list = DBSql.getMaps(sqlById);
                 if (!list.isEmpty()) {
@@ -327,115 +329,115 @@ public class accountController extends BaseController {
     }
 
     @Mapping("com.awspaas.user.apps.donenow_crm.querydepartment")
-	    public String findPchSelect(String accountId,UserContext uc) {
-	       RowMap map = DBSql.getMap("SELECT * FROM orgdepartment WHERE EXT1=?", new Object[] {accountId});
-	       if(map==null) {
-	    	  return fail("���ȱ�����������"); 
-	       }
-		 return success("����ɹ�");
-	      
-	    }
-	 
-	 
-	 @Mapping("com.awspaas.user.apps.donenow_crm.queryhtml")
-	    public String queryhtml(String cateId,String objectId,UserContext uc) {
-		 System.out.println("cateId:"+cateId);
-		 System.out.println("objectId:"+objectId);
-
-		   Map<String, Object> map = new HashMap<>();
-		   map.put("uid", uc.getUID());
-		   map.put("sid", uc.getSessionId());
-		   map.put("cateId", cateId);
-		   map.put("objectId", objectId);
-		   
-		   String ORGID = uc.getCompanyModel().getId();
-			 System.out.println("ORGID:"+ORGID);
-			 //��ѯ����������
-			BO detail = SDK.getBOAPI().query(CrmConstant.BO_EU_DNSYS_UDF_GROUP).detailById(cateId);
-			if(null==detail) {
-				return StringUtils.EMPTY;
-			}
-			 //��ѯ�����������Զ����ֶΣ�����EXTTEXT5
-			List<BO> fieldList = SDK.getBOAPI().query(CrmConstant.BO_EU_DNSYS_UDF_GROUP_FIELD).bindId(detail.getBindId()).list();
-			List<String> list=new ArrayList<String>();
-			for (BO bo : fieldList) {
-				list.add("'"+bo.getString("UDF_FIELD_COL_NAME")+"'");
-			}
-			//����������Ϣȥ�Զ������Ա��в�ѯ�����ֶ���Ϣ������ǰ��ƴ�ӳ�ҳ��
-			String fieldSql="SELECT * FROM "+CrmConstant.BO_EU_DNSYS_UDF_FIELD+" WHERE COL_NAME IN ("+org.apache.commons.lang3.StringUtils.join(list, ",")+") AND ORGID=? AND CATE_ID="+CrmConstant.PZXID+"  ORDER BY SORT_ORDER";
-		   List<RowMap> udfList = DBSql.getMaps(fieldSql, new Object[] { ORGID }); 
-		   System.out.println("sql2:"+fieldSql);
-
-		   map.put("formTitle", "�������Զ����ֶ�");
-		   
-		   List<Map<String, Object>> colFields = new ArrayList<>();
-		   
-		   //��ѯ���ñ�洢����
-		   BO object=SDK.getBOAPI().query(CrmConstant.BO_EU_DNCRM_INSTALLED_PRODUCT).detailById(objectId);
-		   for (RowMap udf : udfList) {
-		     Map<String, Object> field = new HashMap<>();
-		     String COL_NAME = udf.getString("COL_NAME");
-		     
-		     field.put("name", COL_NAME);
-		     if (object != null) {
-		    	   field.put("value", object.getString(COL_NAME));
-		    	     } else {
-		    	     field.put("value", udf.getString("DEFAULT_VALUE"));
-		    	      } 
-		     String DATA_TYPE_ID = udf.getString("DATA_TYPE_ID");
-		     
-		     field.put("type", DATA_TYPE_ID);
-		     if (DATA_TYPE_ID.equals("530")) {
-		       
-		       String sql = udf.getString("SQL_CONFIG");
-		       
-		       if (sql.contains("@")) {
-		         sql = SDK.getRuleAPI().executeAtScript(sql, uc);
-		       }
-		       List<RowMap> list2 = DBSql.getMaps(sql, new Object[0]);
-		       
-		       field.put("list", list2);
-		     } 
-		     
-		     field.put("comment", udf.getString("COL_COMMENT"));
-		     field.put("readonly", udf.getString("IS_PROTECTED"));
-		     field.put("required", udf.getString("IS_REQUIRED"));
-		     
-		     colFields.add(field);
-		   } 
-		   
-		   map.put("colFields", JSON.toJSONString(colFields));
-		   
-		   return HtmlPageTemplate.merge("CONF.html", map);
-		 }
-	 
-	 @Mapping("com.awspaas.user.apps.donenow_crm_save")
-	    public ResponseObject udfSave(UserContext userContext, String cateId, String objectId, String data) throws Exception {
-	      System.out.println("cateId=" + cateId + " objectId=" + objectId);
-	      System.out.println(data);
-	      JSONObject json = JSON.parseObject(data);
-	     String set = "";
-	     List<String> values = new ArrayList<>();
-	     for (String key : json.keySet()) {
-	      String value = json.getString(key);
-	      	if(StringUtils.isBlank(value))
-	      		value="";
-	      	if(value.contains("[")&&value.length()>4) {
-	   		 value=value.substring(2, 3);
-	      	}
-	         set = set + key + "=?,";
-	         values.add(value);
-	     } 
-	     values.add(objectId);
-	
-	    
-	     String sql = "update " + CrmConstant.BO_EU_DNCRM_INSTALLED_PRODUCT + " set " + set.substring(0, set.length() - 1) + " where id=?";
-	      System.out.println("updateBO_EU_DNCRM_INSTALLED_PRODUCTSql:"+sql);
-
-	     DBSql.update(sql, values.toArray());
-	     
-	     return ResponseObject.newOkResponse("����ɹ�");
-   }
-	 
-	
+    public String findPchSelect(String accountId, UserContext uc) {
+        RowMap map = DBSql.getMap("SELECT * FROM orgdepartment WHERE EXT1=?", new Object[]{accountId});
+        if (map == null) {
+            return fail("���ȱ�����������");
+        }
+        return success("����ɹ�");
+
+    }
+
+
+    @Mapping("com.awspaas.user.apps.donenow_crm.queryhtml")
+    public String queryhtml(String cateId, String objectId, UserContext uc) {
+        System.out.println("cateId:" + cateId);
+        System.out.println("objectId:" + objectId);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("uid", uc.getUID());
+        map.put("sid", uc.getSessionId());
+        map.put("cateId", cateId);
+        map.put("objectId", objectId);
+
+        String ORGID = uc.getCompanyModel().getId();
+        System.out.println("ORGID:" + ORGID);
+        //��ѯ����������
+        BO detail = SDK.getBOAPI().query(CrmConstant.BO_EU_DNSYS_UDF_GROUP).detailById(cateId);
+        if (null == detail) {
+            return StringUtils.EMPTY;
+        }
+        //��ѯ�����������Զ����ֶΣ�����EXTTEXT5
+        List<BO> fieldList = SDK.getBOAPI().query(CrmConstant.BO_EU_DNSYS_UDF_GROUP_FIELD).bindId(detail.getBindId()).list();
+        List<String> list = new ArrayList<String>();
+        for (BO bo : fieldList) {
+            list.add("'" + bo.getString("UDF_FIELD_COL_NAME") + "'");
+        }
+        //����������Ϣȥ�Զ������Ա��в�ѯ�����ֶ���Ϣ������ǰ��ƴ�ӳ�ҳ��
+        String fieldSql = "SELECT * FROM " + CrmConstant.BO_EU_DNSYS_UDF_FIELD + " WHERE COL_NAME IN (" + org.apache.commons.lang3.StringUtils.join(list, ",") + ") AND ORGID=? AND CATE_ID=" + CrmConstant.PZXID + "  ORDER BY SORT_ORDER";
+        List<RowMap> udfList = DBSql.getMaps(fieldSql, new Object[]{ORGID});
+        System.out.println("sql2:" + fieldSql);
+
+        map.put("formTitle", "�������Զ����ֶ�");
+
+        List<Map<String, Object>> colFields = new ArrayList<>();
+
+        //��ѯ���ñ�洢����
+        BO object = SDK.getBOAPI().query(CrmConstant.BO_EU_DNCRM_INSTALLED_PRODUCT).detailById(objectId);
+        for (RowMap udf : udfList) {
+            Map<String, Object> field = new HashMap<>();
+            String COL_NAME = udf.getString("COL_NAME");
+
+            field.put("name", COL_NAME);
+            if (object != null) {
+                field.put("value", object.getString(COL_NAME));
+            } else {
+                field.put("value", udf.getString("DEFAULT_VALUE"));
+            }
+            String DATA_TYPE_ID = udf.getString("DATA_TYPE_ID");
+
+            field.put("type", DATA_TYPE_ID);
+            if (DATA_TYPE_ID.equals("530")) {
+
+                String sql = udf.getString("SQL_CONFIG");
+
+                if (sql.contains("@")) {
+                    sql = SDK.getRuleAPI().executeAtScript(sql, uc);
+                }
+                List<RowMap> list2 = DBSql.getMaps(sql, new Object[0]);
+
+                field.put("list", list2);
+            }
+
+            field.put("comment", udf.getString("COL_COMMENT"));
+            field.put("readonly", udf.getString("IS_PROTECTED"));
+            field.put("required", udf.getString("IS_REQUIRED"));
+
+            colFields.add(field);
+        }
+
+        map.put("colFields", JSON.toJSONString(colFields));
+
+        return HtmlPageTemplate.merge("CONF.html", map);
+    }
+
+    @Mapping("com.awspaas.user.apps.donenow_crm_save")
+    public ResponseObject udfSave(UserContext userContext, String cateId, String objectId, String data) throws Exception {
+        System.out.println("cateId=" + cateId + " objectId=" + objectId);
+        System.out.println(data);
+        JSONObject json = JSON.parseObject(data);
+        String set = "";
+        List<String> values = new ArrayList<>();
+        for (String key : json.keySet()) {
+            String value = json.getString(key);
+            if (StringUtils.isBlank(value))
+                value = "";
+            if (value.contains("[") && value.length() > 4) {
+                value = value.substring(2, 3);
+            }
+            set = set + key + "=?,";
+            values.add(value);
+        }
+        values.add(objectId);
+
+
+        String sql = "update " + CrmConstant.BO_EU_DNCRM_INSTALLED_PRODUCT + " set " + set.substring(0, set.length() - 1) + " where id=?";
+        System.out.println("updateBO_EU_DNCRM_INSTALLED_PRODUCTSql:" + sql);
+
+        DBSql.update(sql, values.toArray());
+
+        return ResponseObject.newOkResponse("����ɹ�");
+    }
+
+
 }