企业认证开户接口修改

tianhu-system/pom.xml

@@ -157,7 +157,69 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/lib/taobao-sdk-java-auto_1479188381469-20210630.jar</systemPath>
         </dependency>
-
+        <dependency>
+            <groupId>com.abcb</groupId>
+            <artifactId>sadk</artifactId>
+            <version>3.7.1.0</version>
+            <systemPath>${project.basedir}/src/lib/sadk-3.7.1.0.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>paperless-sadk-ext</artifactId>
+            <version>3.0.2.1</version>
+            <systemPath>${project.basedir}/src/lib/paperless-sadk-ext-3.0.2.1.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.11.1</version>
+            <systemPath>${project.basedir}/src/lib/jackson-annotations-2.11.1.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.11.1</version>
+            <systemPath>${project.basedir}/src/lib/jackson-core-2.11.1.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>jackson-databind-2.11.1</artifactId>
+            <version>2.11.1</version>
+            <systemPath>${project.basedir}/src/lib/jackson-databind-2.11.1.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+        <groupId>paperless.sadk</groupId>
+        <artifactId>jackson-dataformat-cbor</artifactId>
+        <version>2.6.7</version>
+        <systemPath>${project.basedir}/src/lib/jackson-dataformat-cbor-2.6.7.jar</systemPath>
+        <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>logback-cfca-jdk1.6-4.2.1.0</artifactId>
+            <version>4.2.1.0</version>
+            <systemPath>${project.basedir}/src/lib/logback-cfca-jdk1.6-4.2.1.0.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>timestampAPI-4.0.3.0</artifactId>
+            <version>4.0.3.0</version>
+            <systemPath>${project.basedir}/src/lib/timestampAPI-4.0.3.0.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
+        <dependency>
+            <groupId>paperless.sadk</groupId>
+            <artifactId>common-3.6.3.4-tsvo</artifactId>
+            <version>3.6.3.4</version>
+            <systemPath>${project.basedir}/src/lib/common-3.6.3.4-tsvo.jar</systemPath>
+            <scope>system</scope>
+        </dependency>
         <!-- Hibernate Validator -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -53,6 +53,8 @@ public class OwnAuthController extends BaseController {
     @Autowired
     private IOwnCompanyService companyService;
     @Autowired
+    private IOwnSysUserService ownSysUserService;
+    @Autowired
     private ISysDeptService deptService;
     @Autowired
     private ISysRoleService roleService;
@@ -128,8 +130,14 @@ public class OwnAuthController extends BaseController {
 
         //企业名称
         String scyName = CommonUtil.objToString(map.get("scyName"));
+        if(CommonUtil.isEmpty(scyName)){
+            return R.fail("企业名称不能为空");
+        }
         //社会信用代码
         String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
+        if(CommonUtil.isEmpty(scySocialCode)){
+            return R.fail("社会信用代码不能为空");
+        }
         //获取企业信息
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
         //企业名称
@@ -143,22 +151,51 @@ public class OwnAuthController extends BaseController {
         }
         //注册资本
         String scyRegisteredCapital = CommonUtil.objToString(map.get("scyRegisteredCapital"));
-        //时间格式化
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        if(CommonUtil.isEmpty(scyRegisteredCapital)){
+            return R.fail("注册资本不能为空");
+        }
         //注册时间
         String scyStartTime = CommonUtil.objToString(map.get("scyStartTime"));
+        if(CommonUtil.isEmpty(scyStartTime)){
+            return R.fail("注册时间不能为空");
+        }
         //到期时间
         String scyEndTime = CommonUtil.objToString(map.get("scyEndTime"));
+        if(CommonUtil.isEmpty(scyEndTime)){
+            return R.fail("到期时间不能为空");
+        }
         //企业地址
         String scyAddress = CommonUtil.objToString(map.get("scyAddress"));
+        if(CommonUtil.isEmpty(scyAddress)){
+            return R.fail("企业地址不能为空");
+        }
         //企业电话
         String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
+        if(CommonUtil.isEmpty(scyPhone)){
+            return R.fail("企业电话不能为空");
+        }
         //法人姓名
         String scyLegal = CommonUtil.objToString(map.get("scyLegal"));
+        if(CommonUtil.isEmpty(scyLegal)){
+            return R.fail("法人姓名不能为空");
+        }
         //法人证件号码
         String scyLegalId = CommonUtil.objToString(map.get("scyLegalId"));
+        if(CommonUtil.isEmpty(scyLegalId)){
+            return R.fail("法人证件号码不能为空");
+        }
         //经办人姓名
         String handler = CommonUtil.objToString(map.get("handler"));
+        //复核人员
+        String review = CommonUtil.objToString(map.get("review"));
+        if(CommonUtil.isEmpty(review)){
+            return R.fail("复核人员不能为空");
+        }
+        if(CommonUtil.isNotEmpty(handler)&&!review.equals(handler)){
+            return R.fail("复核人员需和经办人名称一致");
+        }else if(CommonUtil.isEmpty(handler)&&!review.equals(scyLegal)){
+            return R.fail("复核人员需和法人名称一致");
+        }
         //经办人身份证号
         String handlerCard =CommonUtil.objToString(map.get("handlerCard"));
         //经办人手机号
@@ -197,8 +234,8 @@ public class OwnAuthController extends BaseController {
         SysCompany.setScyPhone(scyPhone);
         SysCompany.setScyLegal(scyLegal);
         SysCompany.setScyLegalId(scyLegalId);
-            SysCompany.setScyLicenseFile(scyLicenseFile);
-            SysCompany.setScyLegalFile(fsfzzList);
+        SysCompany.setScyLicenseFile(scyLicenseFile);
+        SysCompany.setScyLegalFile(fsfzzList);
         if(fsfzfList.size()>0){
             SysCompany.setScyLegalBackFile(fsfzfList.get(0).get("uid"));
         }
@@ -212,7 +249,12 @@ public class OwnAuthController extends BaseController {
             SysCompany.setScyAppendixFile(qtfjList.get(0).get("uid"));
         }
         //运营商三要素
-        JSONObject operatorAuth = CfcaUtil.operatorAuth(ISPRO, INSTITUTIONID, handler, IDENTIFICATIONTYPE, handlerCard, phoneNumber, zbiRemark);
+        JSONObject operatorAuth =null;
+        if(CommonUtil.isNotEmpty(handler)){
+            operatorAuth=  CfcaUtil.operatorAuth(ISPRO, INSTITUTIONID, review, IDENTIFICATIONTYPE, handlerCard, phoneNumber, zbiRemark);
+        }else{
+            operatorAuth=  CfcaUtil.operatorAuth(ISPRO, INSTITUTIONID, scyLegal, IDENTIFICATIONTYPE, scyLegalId, phoneNumber, zbiRemark);
+        }
         System.out.print("运营商三要素结果==========>" + operatorAuth);
         if("SUCCESS".equals(operatorAuth.getString("Message"))){
             if(!"20".equals(operatorAuth.getString("Verification"))){
@@ -280,13 +322,14 @@ public class OwnAuthController extends BaseController {
         SysUser listUser = userService.selectUserByUserName(phoneNumber);
         if(listUser == null){
             sysUser.setUserName(phoneNumber);
-            sysUser.setNickName(handler);
+            sysUser.setNickName(review);
             String password = configService.selectConfigByKey("sys.user.initPassword");
             sysUser.setPassword(SecurityUtils.encryptPassword(password));
             sysUser.setCreateBy(use.getUserId()+"");
             sysUser.setRoleIds(roleIds);
             userService.insertUser(sysUser);
         } else {
+            listUser.setNickName(review);
             listUser.setRoleIds(roleIds);
             userService.insertUserRole(listUser);
         }
@@ -321,7 +364,12 @@ public class OwnAuthController extends BaseController {
         sysUserCompanyRel.setSucrUserId(listUserTwo.getUserId());
         sysUserCompanyRel.setSucrDeptId(deptId);
         sysUserCompanyRel.setSucrHandler("1");
-        sysUserCompanyRel.setSucrCard(handlerCard);
+        if(CommonUtil.isNotEmpty(handlerCard)){
+            sysUserCompanyRel.setSucrCard(handlerCard);
+        }else{
+            sysUserCompanyRel.setSucrCard(scyLegalId);
+        }
+
         sysUserCompanyRel.setSucrCardFile(fsfzzList);
         if(jsfzfList.size()>0){
             sysUserCompanyRel.setSucrCardBackFile(jsfzfList.get(0).get("uid"));
@@ -332,6 +380,7 @@ public class OwnAuthController extends BaseController {
         //统一社会信用代码
         userCompanyRel.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
         List<SysUserCompanyRel> companyRel = sysUserCompanyRelService.findSysUserCompanyRels(userCompanyRel);
+       //如果当前用户与企业不存在关联,关联当前企业
         if(companyRel.size()==0){
             SysUserCompanyRel userCompany =new SysUserCompanyRel();
             userCompany.setSucrCompanyId(scyId);
@@ -341,7 +390,8 @@ public class OwnAuthController extends BaseController {
             sysUserCompanyRelService.createSysUserCompanyRel(userCompany);
         }
         //修改当前用户企业
-        sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+        sysUserCompanyRelService.updateSysUserCompanyRel(sysUserCompanyRel);
+        //返回企业信息
         SysCompany company = sysCompanyService.getById(scyId);
         return R.ok(company);
     }
@@ -429,53 +479,43 @@ public class OwnAuthController extends BaseController {
         bank.eq(PayBankAccInf::getPbaiAccountName,pbaiAccountName);
         bank.eq(PayBankAccInf::getPbaiBankaccountId,pbaiBankaccountId);
         List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
+
         if(bankAcc.size()>0){
             //取得指定时间间隔后的系统时间
             GregorianCalendar calendar = (GregorianCalendar) Calendar.getInstance();
-            calendar.add( Calendar.HOUR_OF_DAY, -3);
+            calendar.add( Calendar.DAY_OF_MONTH, 3);
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
             System.out.println("比较时间"+formatter.format(calendar.getTime()));
             System.out.println("最后时间"+formatter.format(bankAcc.get(0).getPbaiCfcaDate()));
             if(formatter.format(calendar.getTime()).compareTo(formatter.format(bankAcc.get(0).getPbaiCfcaDate()))<0){
-                throw new BaseException("当前账户已存在！");
+                throw new BaseException("当前账户已存在");
             }
+            }else{
             //企业打款申请
             JSONObject operatorAuth = CfcaUtil.paymentApply(ISPRO, INSTITUTIONID, pbaiAccountName, pbaiBankaccountId,list.get(0).getZcbiBankNo(),zbiRemark);
             System.out.print("绑定对公户返回结果==========>" + operatorAuth);
             String  TxSN =  operatorAuth.getString("TxSN");
             if("SUCCESS".equals(operatorAuth.getString("Message"))){
-                if(!"20".equals(operatorAuth.getString("Verification"))){
+                if(!"20".equals(operatorAuth.getString("Status"))){
                     return R.fail("绑定账户失败");
                 };
             }else{
                 return R.fail("绑定账户失败");
             }
-            return R.ok();
-        }
-        PayBankAccInf payBankAccInf = new PayBankAccInf();
-        String  pbiId  =  IdUtils.fastSimpleUUID();
-        payBankAccInf.setPbaiId(pbiId);
-        payBankAccInf.setPbaiCstno(scyId);
-        payBankAccInf.setPbaiAccountName(pbaiAccountName);
-        payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
-        payBankAccInf.setPbaiBankName(pbaiBankName);
-        payBankAccInf.setPbaiStatus("1");
-        //企业打款申请
-        JSONObject operatorAuth = CfcaUtil.paymentApply(ISPRO, INSTITUTIONID, pbaiAccountName, pbaiBankaccountId,list.get(0).getZcbiBankNo(),zbiRemark);
-        System.out.print("绑定对公户返回结果==========>" + operatorAuth);
-      String  TxSN =  operatorAuth.getString("TxSN");
-        if("SUCCESS".equals(operatorAuth.getString("Message"))){
-            if(!"20".equals(operatorAuth.getString("Status"))){
-                return R.fail("绑定账户失败");
-            };
-        }else{
-            return R.fail("绑定账户失败");
+            PayBankAccInf payBankAccInf = new PayBankAccInf();
+            String  pbiId  =  IdUtils.fastSimpleUUID();
+            payBankAccInf.setPbaiId(pbiId);
+            payBankAccInf.setPbaiCstno(scyId);
+            payBankAccInf.setPbaiAccountName(pbaiAccountName);
+            payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
+            payBankAccInf.setPbaiBankName(pbaiBankName);
+            payBankAccInf.setPbaiStatus("1");
+            payBankAccInf.setPbaiCfcaNo(TxSN);
+            //获取当前时间
+            Date currentTime = DateUtils.getNowDate();
+            payBankAccInf.setPbaiCfcaDate(currentTime);
+            payBankAccInfService.createPayBankAccInf(payBankAccInf);
         }
-        payBankAccInf.setPbaiCfcaNo(TxSN);
-        //获取当前时间
-        Date currentTime = DateUtils.getNowDate();
-        payBankAccInf.setPbaiCfcaDate(currentTime);
-        payBankAccInfService.createPayBankAccInf(payBankAccInf);
         return R.ok();
     }
 
@@ -515,17 +555,26 @@ public class OwnAuthController extends BaseController {
         //打款验证
         JSONObject operatorAuth = CfcaUtil.paymentAuth(ISPRO, INSTITUTIONID, bankAcc.get(0).getPbaiCfcaNo(), amount, zbiRemark);
         System.out.print("打款认证结果==========>" + operatorAuth);
-        if("SUCCESS".equals(operatorAuth.getString("Message"))){
-            if(!"20".equals(operatorAuth.getString("Verification"))){
+        if (!"交易异常[已验证通过，不能重复验证]".equals(operatorAuth.getString("Message"))) {
+            //校验已通过
+            if ("SUCCESS".equals(operatorAuth.getString("Message"))) {
+                if (!"20".equals(operatorAuth.getString("Verification"))) {
+                    return R.fail("账户验证失败");
+                }
+                ;
+            } else {
                 return R.fail("账户验证失败");
-            };
-        }else{
-            return R.fail("账户验证失败");
+            }
         }
         PayBankAccInf payBankAccInf =new PayBankAccInf();
         payBankAccInf.setPbaiId(bankAcc.get(0).getPbaiId());
         payBankAccInf.setPbaiStatus("0");
         payBankAccInfService.updatePayBankAccInf(payBankAccInf);
+        SysCompany sysCompany =new SysCompany();
+        sysCompany.setScyId(companyRel.get(0).getSucrCompanyId());
+        //待实名认证
+        sysCompany.setScyStatus("04");
+        sysCompanyService.updateSysCompany(sysCompany);
         return R.ok();
     }
     /**
@@ -571,6 +620,10 @@ public class OwnAuthController extends BaseController {
         String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
         //企业电话
         String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
+        //法人姓名
+        String scyLegal = CommonUtil.objToString(map.get("scyLegal"));
+        //法人证件号码
+        String scyLegalId = CommonUtil.objToString(map.get("scyLegalId"));
         //经办人姓名
         String handler = CommonUtil.objToString(map.get("handler"));
         //经办人身份证号
@@ -593,11 +646,34 @@ public class OwnAuthController extends BaseController {
         sysCompany.setScyId(scyId);
         //正常状态
         sysCompany.setScyStatus("00");
+        //默认供应商
+        sysCompany.setScyType("02");
+        JSONObject companyAccount =null;
+        if(CommonUtil.isNotEmpty(handler)) {
+             companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, handler, TYPECODE, handlerCard);
+        }else{
+            companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, scyLegal, TYPECODE, scyLegalId);
+        }
+        System.out.print("开户结果==========>" + companyAccount);
+        //返回cfca用户id
+        String userId = companyAccount.getJSONObject("enterprise").getString("userId");
+        sysCompany.setScyCfcaUserId(userId);
         sysCompanyService.updateSysCompany(sysCompany);
+        //查询账户
+        LambdaQueryWrapper<SysCompany> company = new LambdaQueryWrapper<>();
+        //所属银行
+        company.eq(SysCompany::getScyId,scyId);
+        List<SysCompany> pany = sysCompanyService.findSysCompanys(company);
         // 融资企业权限配置
         String sysCompanyProductId = IdUtils.fastSimpleUUID();
         SysCompanyProduct sysCompanyProduct = new SysCompanyProduct();
-        String managementProductId = configService.selectConfigByKey("system.company.supplier");
+        String managementProductId = null;
+        //判断是核心企业还是供应商
+        if("01".equals(pany.get(0).getScyType())){
+             managementProductId = configService.selectConfigByKey("system.company.core");
+        }else{
+            managementProductId = configService.selectConfigByKey("system.company.supplier");
+        }
         sysCompanyProduct.setScpProducId(managementProductId);
         sysCompanyProduct.setScpCompanyId(scyId);
         sysCompanyProduct.setScpId(sysCompanyProductId);
@@ -605,9 +681,6 @@ public class OwnAuthController extends BaseController {
         sysCompanyProduct.setScpEndDate("20990101");
         sysCompanyProduct.setScpState("00");
         sysCompanyProductService.insertSysCompanyProduct(sysCompanyProduct);
-        JSONObject companyAccount = AxqCommonUtil.companyAccount(scyName, IDENTTYPECODE, scySocialCode, phoneNumber, scyPhone, AUTHENTICATIONMODE, handler, TYPECODE, handlerCard);
-       //返回用户id
-        Object userId = companyAccount.getJSONObject("enterprise").get("userid");
         return R.ok();
     }
     /**
@@ -619,20 +692,43 @@ public class OwnAuthController extends BaseController {
     public R cashBack() throws Exception {
         //获取登录用户
         LoginUser user = tokenService.getLoginUser();
-        String companyId = user.getSysUser().getCompanyId();
+        String userName= user.getSysUser().getUserName();
+        OwnSysUser  ownSysUser =new OwnSysUser();
+        ownSysUser.setUserName(userName);
+        List<OwnSysUser> userList = ownSysUserService.selectUserList(ownSysUser);
         SysCompany list =null;
         Map map =new HashMap();
-        if(CommonUtil.isNotEmpty(companyId)){
-            list  = sysCompanyService.getById(companyId);
-            map.put("list",list);
-            if(list!=null){
-                //查询账户
-                LambdaQueryWrapper<PayBankAccInf> bank = new LambdaQueryWrapper<>();
-                //所属银行
-                bank.eq(PayBankAccInf::getPbaiCstno,list.getScyId());
-                bank.orderByDesc(PayBankAccInf::getPbaiCfcaDate);
-                List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
-                map.put("data",bankAcc);
+        if(userList.size()>0){
+            //查询账户
+            LambdaQueryWrapper<SysUserCompanyRel> userCompanyRel = new LambdaQueryWrapper<>();
+            //所属银行
+            userCompanyRel.eq(SysUserCompanyRel::getSucrUserId,userList.get(0).getUserId());
+            userCompanyRel.orderByDesc(SysUserCompanyRel::getCreateTime);
+            List<SysUserCompanyRel> userCompanyRelList = sysUserCompanyRelService.findSysUserCompanyRels(userCompanyRel);
+            if(userCompanyRelList.size()>0){
+                list  = sysCompanyService.getById(userCompanyRelList.get(0).getSucrCompanyId());
+                map.put("list",list);
+                if(list!=null){
+                    //查询账户
+                    LambdaQueryWrapper<PayBankAccInf> bank = new LambdaQueryWrapper<>();
+                    //所属银行
+                    bank.eq(PayBankAccInf::getPbaiCstno,list.getScyId());
+                    bank.orderByDesc(PayBankAccInf::getPbaiCfcaDate);
+                    List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
+                    //查询经办人
+                    LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
+                    sysUserCompanyRel.eq(SysUserCompanyRel::getSucrCompanyId,list.getScyId());
+                    sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,"1");
+                    List<SysUserCompanyRel> userCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
+                  if (userCompanyRels.size()>0){
+                      OwnSysUser  sysUser =new OwnSysUser();
+                      sysUser.setUserId(userCompanyRels.get(0).getSucrUserId().toString());
+                      List<OwnSysUser> users = ownSysUserService.selectUserList(sysUser);
+                      map.put("user",users);
+                  }
+                    map.put("data",bankAcc);
+                    map.put("userCompany",userCompanyRels);
+                }
             }
         }
         return R.ok(map);

tianhu-system/src/main/java/com/tianhu/system/companyAuth/service/impl/OwnAuthServiceImpl.java

@@ -115,13 +115,13 @@ public class OwnAuthServiceImpl implements IOwnAuthService {
             sysCompany.setScyRegisteredCapital(scyRegisteredCapital);
             //成立日期
             String scyStartTime = wordsResult.getJSONObject("成立日期").getString("words");
-            if(CommonUtil.isNotEmpty(scyStartTime)) {
+            if(CommonUtil.isNotEmpty(scyStartTime)&&!"无".equals(scyStartTime)) {
                 scyStartTime = scyStartTime.replace("年", "-").replace("月", "-").replace("日", "");
                 sysCompany.setScyStartTime(scyStartTime);
             }
             //有效期
                 String scyEndTime = wordsResult.getJSONObject("有效期").getString("words");
-            if(CommonUtil.isNotEmpty(scyEndTime)) {
+            if(CommonUtil.isNotEmpty(scyEndTime)&&!"无".equals(scyEndTime)) {
                 scyEndTime = scyEndTime.replace("年", "-").replace("月", "-").replace("日", "");
                 sysCompany.setScyEndTime(scyEndTime);
             }

tianhu-system/src/main/java/com/tianhu/system/domain/SysCompany.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author cuixq
- * @since 2021-08-25
+ * @since 2021-08-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -152,6 +152,12 @@ public class SysCompany implements Serializable {
     private String scyManager;
 
     /**
+     * CFCA电子签章用户id
+     */
+    @TableField("scy_cfca_user_id")
+    private String scyCfcaUserId;
+
+    /**
      * 备注
      */
     @TableField("scy_remarks")

tianhu-system/src/main/resources/mapper/system/OwnSysUserMapper.xml

@@ -64,20 +64,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sys_user_company_rel ucr
 		on
 			(ucr.sucr_user_id = u.user_id
-			<if test="companyId != '000000'">
-				and ucr.sucr_company_id = #{companyId}
-			</if>
+<!--			<if test="companyId != '000000'">-->
+<!--				and ucr.sucr_company_id = #{companyId}-->
+<!--			</if>-->
 			)
 		WHERE u.del_flag = '0'
-		<if test="companyId != '000000'">
-			and ucr.sucr_company_id = #{companyId}
-		</if>
+<!--		<if test="companyId != '000000'">-->
+<!--			and ucr.sucr_company_id = #{companyId}-->
+<!--		</if>-->
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="nickName != null and nickName != ''">
 			AND u.nick_name like concat('%', #{nickName}, '%')
 		</if>
+		<if test="userId != null and userId != ''">
+			AND u.user_id = #{userId}
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>

tianhu-system/src/main/resources/mapper/system/SysCompanyMapper.xml

@@ -25,6 +25,7 @@
         <result column="scy_scale" property="scyScale" />
         <result column="scy_organization" property="scyOrganization" />
         <result column="scy_manager" property="scyManager" />
+        <result column="scy_cfca_user_id" property="scyCfcaUserId" />
         <result column="scy_remarks" property="scyRemarks" />
         <result column="scy_auth_status" property="scyAuthStatus" />
         <result column="scy_status" property="scyStatus" />