修改bug

Pu Zhibing

5 天以前 e25d138ac2e1a2b271b27bbc1973f0b5898b1d82

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -339,9 +339,13 @@
       if (count > 0) {
          return "error";
       }
      if(ToolUtil.isEmpty(tCompany.getIdentifier())){
         return "统一社会信用代码不能为空";
      }
       //调用中台接口创建企业
       CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
       String enterCode = "";
//       CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
      CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
      String enterCode = "";
      Integer enterNew = null;
      Long empId = null;
       Integer empnew = null;
@@ -352,6 +356,7 @@
          CreateEnterpriseRequest request = new CreateEnterpriseRequest();
          request.setName(tCompany.getName());
          request.setNickName(tCompany.getName());
         request.setUscc(tCompany.getIdentifier());
          request.setIndustry_code("123456");
          request.setMobile(account);
          CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
@@ -497,7 +502,7 @@
       TCompany tCompany = tCompanyService.selectById(tCompanyId);
       //调用中台接口创建企业
       if(1 == tCompany.getEnterNew()){
          CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
          CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
          if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
             ShiroUser user1 = shiroExtUtil.getUser();
             User user = userService.selectById(user1.getId());
@@ -574,8 +579,11 @@
       if (count > 0) {
          return "error";
       }
      if(ToolUtil.isEmpty(tCompany.getIdentifier())){
         return "统一社会信用代码不能为空";
      }
       //调用中台接口创建企业
       CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
       CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
       String enterCode = "";
       Long empId = null;
       Integer empnew = null;
@@ -588,6 +596,7 @@
          CreateEnterpriseRequest request = new CreateEnterpriseRequest();
          request.setName(tCompany.getName());
          request.setNickName(tCompany.getName());
         request.setUscc(tCompany.getIdentifier());
          request.setIndustry_code("123456");
          request.setMobile(account);
          CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);