calyrex 2.18

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/Getgsjc_controller.java

@@ -41,7 +41,7 @@ public class Getgsjc_controller {
             String sql = "SELECT gsjc AS gsjc, gsjcdm AS gsjcdm" +
                     " FROM (" +
                     " SELECT t1.*, t2.id AS subcomid" +
-                    " FROM hrmsubcompanydefined t1" +
+                    " FROM eteams.dbo.hrmsubcompanydefined t1" +
                     " LEFT JOIN eteams.dbo.department t2" +
                     " ON t1.FORM_DATA_ID = t2.formdata" +
                     " AND t2.delete_type = 0" +
@@ -49,8 +49,9 @@ public class Getgsjc_controller {
                     ") hsd" +
                     " WHERE hsd.subcomid = " + gsid +
                     " AND hsd.delete_type = 0";
+            log.error("getgsjc_controller sql--" + sql);
             String sourceType = null2String(SourceType.LOGIC);
-            String groupId = "weaver-doc-service";
+            String groupId = "weaver-hr-service";
             Map<String, Object> datas = executeForQuery(sourceType, groupId, sql);
             if(String.valueOf(datas.get("status")).equals("OK")){
                 List<Map<String,Object>> records = (List<Map<String,Object>>)datas.get("records");
@@ -60,10 +61,10 @@ public class Getgsjc_controller {
                     json.put("gsjcdm",map.get("gsjcdm"));
                     return WeaResult.success(json);
                 }else {
-                    log.info("getCustomId 相关字段未找到");
+                    log.error("getCustomId 相关字段未找到");
                 }
             }else {
-                log.info("getUserId status-->"+ datas.get("status"));
+                log.error("getUserId status-->"+ datas.get("status"));
             }
         }catch (Exception e){
             log.error("getgsjc_controller execute error : " ,e);
@@ -73,16 +74,16 @@ public class Getgsjc_controller {
     }
 
     public Map<String, Object> executeForQuery(String sourceType, String groupId, String sql) {
-//        log.info("executeForQuery sourceType-->" + sourceType + ",groupId-->" + groupId + ",sql-->" + sql);
+//        log.error("executeForQuery sourceType-->" + sourceType + ",groupId-->" + groupId + ",sql-->" + sql);
         final Tenant currentTenant = TenantContext.getCurrentTenant();
         TenantRpcContext.setTargetTenantKey(String.valueOf(currentTenant));
         ExecuteSqlEntity executeSqlEntity = new ExecuteSqlEntity();
         executeSqlEntity.setSql(cn.hutool.core.codec.Base64.encode(sql));
         executeSqlEntity.setGroupId(groupId); //groupid,可以访问  E10地址/api/datasource/ds/group?sourceType=LOGIC 获取
         executeSqlEntity.setSourceType(SourceType.valueOf(sourceType));
-//        log.info("executeForQuery executeSqlEntity-->"+executeSqlEntity.getSql()+"-->"+executeSqlEntity.getGroupId()+"-->"+executeSqlEntity.getSourceType());
+//        log.error("executeForQuery executeSqlEntity-->"+executeSqlEntity.getSql()+"-->"+executeSqlEntity.getGroupId()+"-->"+executeSqlEntity.getSourceType());
         Map<String, Object> datas = dataSetService.executeSql(executeSqlEntity);
-//        log.info("executeForQuery datas-->" + datas);
+        log.error("executeForQuery datas-->" + datas);
         TenantRpcContext.removeTargetTenantKey();
         return datas;
     }