企业经办人逻辑调整修改

core/src/main/java/com/hand/app/esignHclc/service/impl/OrganSignInfoHclcServiceImpl.java

@@ -102,6 +102,9 @@ public class OrganSignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHc
             isManager = getManagerStatus(param);
         }
 
+        if (isManager == null) {
+            isManager = "N";
+        }
         //注册前判断企业是否已完成对公打款认证
         SignUserInfoHclc managerSignInfo = new SignUserInfoHclc();
         managerSignInfo.setIdNo(info.getIdNo());
@@ -540,12 +543,12 @@ public class OrganSignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHc
 
             //发送http请求
             SignHclcUtils signHclcUtils1 = new SignHclcUtils();
-            String stringResult = signHclcUtils1.postString(url, requestData, headInfo, signHclcUtils1.APPLICATION_FORM_URLENCODED);
+            String stringResult = signHclcUtils1.postString(url, params, headInfo, signHclcUtils1.APPLICATION_FORM_URLENCODED);
 
             //解析返回结果
             JSONObject jsonResult = JSONObject.parseObject(stringResult);
             if ("true".equalsIgnoreCase(jsonResult.getString("success"))) {
-                return jsonResult.getString("isManager");
+                return jsonResult.getString("admin_flag");
             } else {
                 return "N";
             }

core/src/main/java/com/hand/app/esignHclc/service/impl/SignInfoHclcServiceImpl.java

@@ -1190,7 +1190,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
 
             //获取需要发送微信通知的签署人
             if (!"HCLC".equalsIgnoreCase(role) && !"AGENT".equalsIgnoreCase(role)) {
-                json1.getString("agentIdNo");
+                agentIdNo = json1.getString("agentIdNo");
             }
 //            if ("HCLC".equalsIgnoreCase(role)) {
 //
@@ -1461,11 +1461,18 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
         if ("SIGN_FLOW_UPDATE".equalsIgnoreCase(params.getString("action"))) {
             JSONObject accountInfo = params.getJSONObject("accountInfo");
             SignUserInfoHclc signUserInfoHclc = new SignUserInfoHclc();
+
+            if(Objects.nonNull(accountInfo.getString("accountUid"))){
+                signUserInfoHclc.setOpenId(accountInfo.getString("accountUid"));
+            }
             //判断是否机构用户
             if (Objects.isNull(accountInfo.getString("authOrgId")) || "".equalsIgnoreCase(accountInfo.getString("authOrgId"))) {
                 signUserInfoHclc.setAccountId(accountInfo.getString("accountId"));
             } else {
                 signUserInfoHclc.setAccountId(accountInfo.getString("authOrgId"));
+                if(Objects.nonNull(accountInfo.getString("accountId"))){
+                    signUserInfoHclc.setAgentAccountId(accountInfo.getString("accountId"));
+                }
             }
 
             JSONObject accountInfoNew = new JSONObject();