err

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java

@@ -64,16 +64,13 @@ public class TransUtil {
 
 	public Map<String,String> getDTtripMt(String workcode){
 		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-//		String poolname = CONN_TYPE.ebuilder.getType();
-//		rs.setTenantKey("t6kj9c07jr");//集团租户key
-		String poolname ="E10JTZH";
+		String poolname = "E10JTZH";
+//		rs.setTenantKey(tenantKey);
 		Map<String,String> map = new HashMap<>();
 		if("".equals(workcode)){
 			return map;
 		}
-		Map<String,String> rymap = getResourceInfoByworkcode(workcode);
-		String subcompanyid1 = rymap.get("subcompanyid1");
-		String sql = "select a.* from e10_common.dbo.uf_tcdjmt a where a.gs ='"+subcompanyid1+"' and a.delete_type=0";
+		String sql = "select a.* from e10_common.dbo.uf_tcdjmt a,eteams.dbo.employee b,eteams.dbo.department c  where  b.DEPARTMENT =c.id and c.subcompanyid =a.gs and b.job_num ='"+workcode+"' and a.delete_type=0";
 		rs.executeSql(sql, poolname);
 		if(rs.next()){
 			map.put("account",Util.null2String(rs.getString("zh")));

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

@@ -140,6 +140,7 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act
                 if (!sta.equals("S")) {
                     request.getRequestManager().setMessageid("100001");
                     request.getRequestManager().setMessagecontent(meg);
+
                 } else {
                     try {
                         CRM_SyncUnFreezeTimesStub.CRM_OA_SyncUnFreezeTimes times = new CRM_SyncUnFreezeTimesStub.CRM_OA_SyncUnFreezeTimes();

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

@@ -50,7 +50,7 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                 for (int j = 0; j < aproperty.length; j++) {
                     String name = aproperty[j].getName().toUpperCase();
                     String value = Util.null2String(aproperty[j].getValue());
-                    if ("XXJLLX".equals(name)) {
+                    if ("xxjllx".equals(name)) {
                         xxjllx = value;
                     }
                 }

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

@@ -55,7 +55,7 @@ public class ZSRM_PUR_INFO_GY132_CheckAction extends BaseBean implements Action,
                 logger_69d789ca.error("sync -----" + sync);
                 if ("0".equals(sync)) {
                     DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
-                    DetailTable dtq = detailtable[1];
+                    DetailTable dtq = detailtable[2];
                     Row[] sq = dtq.getRow();
                     if (sq.length > 0) {
                         String[][] str = new String[sq.length][21];