企业认证审批修改

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -584,10 +584,13 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrHandler("1");
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
+                    sysUserCompanyRel.setSucrCardFile(jsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 }else{
                     sysUserCompanyRel.setSucrCard(scyLegalId);
+                    sysUserCompanyRel.setSucrCardFile(fsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(fsfzfList);
                 }
-                sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 sysUserCompanyRel.setUpdateBy(use.getUserId()+"");
                 sysUserCompanyRel.setUpdateTime(new Date());
@@ -604,11 +607,13 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrHandler("1");
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
+                    sysUserCompanyRel.setSucrCardFile(jsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 }else{
                     sysUserCompanyRel.setSucrCard(scyLegalId);
+                    sysUserCompanyRel.setSucrCardFile(fsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(fsfzfList);
                 }
-                sysUserCompanyRel.setSucrCardFile(fsfzzList);
-                sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 sysUserCompanyRel.setCreateBy(use.getUserId()+"");
                 sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
@@ -645,11 +650,13 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrHandler("1");
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
+                    sysUserCompanyRel.setSucrCardFile(jsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 }else{
                     sysUserCompanyRel.setSucrCard(scyLegalId);
+                    sysUserCompanyRel.setSucrCardFile(fsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(fsfzfList);
                 }
-                sysUserCompanyRel.setSucrCardFile(fsfzzList);
-                sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 sysUserCompanyRel.setCreateBy(use.getUserId()+"");
                 sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.saveOrUpdate(sysUserCompanyRel);
@@ -678,11 +685,13 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrHandler("1");
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
+                    sysUserCompanyRel.setSucrCardFile(jsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 }else{
                     sysUserCompanyRel.setSucrCard(scyLegalId);
+                    sysUserCompanyRel.setSucrCardFile(fsfzzList);
+                    sysUserCompanyRel.setSucrCardBackFile(fsfzfList);
                 }
-                sysUserCompanyRel.setSucrCardFile(fsfzzList);
-                sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 sysUserCompanyRel.setCreateBy(use.getUserId()+"");
                 sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
@@ -873,6 +882,7 @@ public class OwnAuthController extends BaseController {
             if (!"200".equals(flowableRes.get("code"))) {
                 throw new Exception("审批数据新增失败!");
             }
+            System.out.println(company.getScyType());
             //核心企业初始化流程图
             if("01".equals(company.getScyType())){
                 flowableRes = flowableService.initializeFlow(String.valueOf(operatorUser.getUserId()), scyId, request);
@@ -1291,7 +1301,7 @@ public class OwnAuthController extends BaseController {
             }
             }
         System.out.print("开户结果==========>" + companyAccount);
-        if(companyAccount.getJSONObject("errorCode")!=null){
+        if(companyAccount.getJSONObject("head")==null){
            return  R.fail(companyAccount.getJSONObject("errorMessage"));
         }
         //返回cfca用户id

tianhu-system/src/main/java/com/tianhu/system/utils/FlowableService.java

@@ -2,6 +2,7 @@ package com.tianhu.system.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.ServletUtils;
 import com.tianhu.system.api.domain.SysDept;
 import com.tianhu.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,6 +132,14 @@ public class FlowableService {
 	    conn.setRequestMethod("POST");
 	    conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
 	    conn.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length));
+
+		HttpServletRequest request = ServletUtils.getRequest();
+		if (request != null) {
+			if (request.getHeader("Authorization") != null) {
+				conn.setRequestProperty("Authorization", request.getHeader("Authorization").replace("Bearer ", ""));
+			}
+		}
+
 	    conn.setDoOutput(true);
 	    conn.getOutputStream().write(postDataBytes);