Merge remote-tracking branch 'origin/master'

src/main/java/fi/cas/opplugin/PayBillToolUtil.java

@@ -1110,7 +1110,7 @@ public class PayBillToolUtil {
     public static String payBillForCBSSync(DynamicObject[] billEntities) {
         StringBuffer errMsg = new StringBuffer();
         //获取接口链接等信息
-        DynamicObject jkpzxx = BusinessDataServiceHelper.loadSingle("nckd_jkpzxx",new QFilter[]{new QFilter("number","=","paytozfqzZFQZdb")});
+        DynamicObject jkpzxx = BusinessDataServiceHelper.loadSingle("nckd_jkpzxx",new QFilter[]{new QFilter("number","=","paytoZFQZdb")});
         String servername =  jkpzxx.getString("nckd_servername");
         String port =  jkpzxx.getString("nckd_port");
 

src/main/java/fi/cas/task/AgentPayQueryStatusTast.java

@@ -85,7 +85,7 @@ public class AgentPayQueryStatusTast extends AbstractTask {
                                 dataEntity.set("nckd_hxzt","B");//核心状态
                                 int SuccNum = datainfo.getInt("SuccNum");//成功条数
                                 int FailNum = datainfo.getInt("FailNum");//失败条数
-                                dataEntity.set("nckd_hxsbyy","支付部分成功，成功"+SuccNum+"条，失败"+FailNum+"条");
+                                dataEntity.set("nckd_hxsbyy","支付失败或部分成功，成功"+SuccNum+"条，失败"+FailNum+"条");
                                 //调用分录查询
                                 Map<String,String[]> entryqueryMap = new HashMap<>();
                                 DynamicObject payeracctbankEntity = BusinessDataServiceHelper.loadSingleFromCache(dataEntity.getDynamicObject("payeracctbank").getPkValue(), "am_accountbank");

src/main/java/fi/em/formPlugin/SubAndAudFormPlugin.java

@@ -188,8 +188,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
         //当前单据分录类型
         String nckd_entrytype=dynamicObject.getString("nckd_entrytype");
 
-        //保存前，计算汇总分录
-        if ("save".equals(source.getOperateKey())||"countall".equals(source.getOperateKey())){
+        //保存,提交前，计算汇总分录
+        if ("save".equals(source.getOperateKey())||"submit".equals(source.getOperateKey())){
             //分录类型为通用薪酬一般员工
             if ("A".equals(nckd_entrytype)) {
                 //先清空汇总分录分录

src/main/java/kd/bos/login/thirdauth/app/ZSBGAuthtication.java

@@ -1,6 +1,6 @@
 package kd.bos.login.thirdauth.app;
 
-import com.jxbank.sso.des.LockDesUtil;
+//import com.jxbank.sso.des.LockDesUtil;
 import kd.bos.dc.api.model.Account;
 
 import javax.servlet.http.HttpServletRequest;
@@ -24,11 +24,11 @@ public class ZSBGAuthtication extends ThirdAppAuthtication{
         result.setSucceed(false);
         if(user!=null && !"".equals(user)){
             String token = request.getParameter("token");
-            if (LockDesUtil.isTheRightDate(user, token)) {//调用第三方jar包方法验证token和user一致
-                result.setUserType(UserType.WORKER_NUMBER);
-                result.setSucceed(true);
-                result.setUserFlag(user);
-            }
+//            if (LockDesUtil.isTheRightDate(user, token)) {//调用第三方jar包方法验证token和user一致
+//                result.setUserType(UserType.WORKER_NUMBER);
+//                result.setSucceed(true);
+//                result.setUserFlag(user);
+//            }
         }
 
         return result;