企业，链属修改

sc-service/src/main/java/com/huyi/service/conmany/controller/OwnCompanyManageController.java

@@ -341,7 +341,7 @@ public class OwnCompanyManageController extends BaseController
     /**
      * 获取企业明细信息
      */
-    @PreAuthorize(hasPermi = "service:company:query")
+//    @PreAuthorize(hasPermi = "service:company:query")
     @GetMapping("/{scyId}")
     public R getCompanyInfo(@PathVariable("scyId") String scyId) throws Exception {
 

sc-service/src/main/java/com/huyi/service/rel/controller/CompanyRelImportController.java

@@ -299,12 +299,6 @@ public class CompanyRelImportController extends BaseController
                     log.error("新增" + scyName + "的链属失败，联系人不能大于30位");
                     continue;
                 }
-            }else{
-                userNameList += scyName+",";
-                failureNum++;
-                failureMsg.append("<br/>第" + (i+1) + "行数据导入失败,联系人不能为空");
-                log.error("新增" + scyName + "的链属失败，联系人不能为空");
-                continue;
             }
             //联系人手机号
             if(CommonUtil.isNotEmpty(scrContarctPhone)){
@@ -326,12 +320,6 @@ public class CompanyRelImportController extends BaseController
                     log.error("新增" + scyName + "的链属失败，联系人手机号不能超过11位");
                     continue;
                 }
-            }else{
-                userNameList += scyName+",";
-                failureNum++;
-                failureMsg.append("<br/>第" + (i+1) + "行数据导入失败,联系人手机号不能为空");
-                log.error("新增" + scyName + "的链属失败，联系人手机号不能为空");
-                continue;
             }
             //查询链属企业信息
             LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();

sc-service/src/main/java/com/huyi/service/rel/controller/OwnCompanyRelController.java

@@ -276,13 +276,12 @@ public class OwnCompanyRelController extends BaseController
     /**
      * 查询企业
      */
-    @GetMapping("/companyListQuery/{scyName}")
+    @GetMapping("/companyListQuery/{scyId}")
     @Log(title = "查询企业列表", businessType = BusinessType.OTHER)
     @Transactional(rollbackFor = Exception.class)
-    public R companyListQuery(@PathVariable("scyName") String scyName)throws Exception {
+    public R companyListQuery(@PathVariable("scyId") String scyId)throws Exception {
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysCompany::getScyName,scyName);
-        queryWrapper.eq(SysCompany::getScyStatus,NORMAL_STATE);
+        queryWrapper.eq(SysCompany::getScyId,scyId);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
         return R.ok(list);
     }
@@ -323,15 +322,6 @@ public class OwnCompanyRelController extends BaseController
         if(!isMatSocialCode){
             throw new Exception("统一信用代码格式错误");
         }
-        //查询链属企业信息
-        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
-        //统一社会信用代码
-        queryWrapper.eq(SysCompany::getScySocialCode,scySocialCode);
-        //企业名称
-        queryWrapper.like(SysCompany::getScyName,scyName);
-        //状态00
-        queryWrapper.ne(SysCompany::getScyStatus,DELETE_STATE);
-        List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
         //链属联系人
         String scrContarct = CommonUtil.objToString(map.get("scrContarct"));
         if(scrContarct.length() > 30){
@@ -365,9 +355,8 @@ public class OwnCompanyRelController extends BaseController
         //创建主键
         String scrId = IdUtils.fastSimpleUUID();
         //链属企业Id
-        String scyId = "";
-        if(list.size() > 0) {
-            scyId = list.get(0).getScyId();
+        String scyId = CommonUtil.objToString(map.get("scyId"));
+        if(CommonUtil.isNotEmpty(scyId)) {
             String finalScyId = scyId;
             //判断两者是否已经链属
             LambdaQueryWrapper<SysCompanyRel> wrapper = new LambdaQueryWrapper<>();
@@ -565,7 +554,7 @@ public class OwnCompanyRelController extends BaseController
     public R listAllCompany()throws Exception {
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysCompany::getScyStatus,NORMAL_STATE);
-        queryWrapper.and(i -> i.eq(SysCompany::getScyType, CONFIRM_STATE).or().eq(SysCompany::getScyType, REFUSE_STATE));
+        queryWrapper.eq(SysCompany::getScyType, CONFIRM_STATE).or().eq(SysCompany::getScyType, REFUSE_STATE);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
         return R.ok(list);
     }

sc-service/src/main/resources/mapper/rel/OwnCompanyRelMapper.xml

@@ -33,10 +33,12 @@
             AND (r.scr_launch_company_id = #{paramMap.companyId} OR r.scr_receive_company_id = #{paramMap.companyId})
         </if>
         <if test="paramMap.companyName != null and paramMap.companyName != '' ">
-            AND (s.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') OR p.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%'))
+            AND (s.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') AND r.scr_receive_company_id = #{paramMap.companyId})
+            OR (p.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') AND r.scr_launch_company_id = #{paramMap.companyId})
         </if>
         <if test="paramMap.scySocialCode != null and paramMap.scySocialCode != '' ">
-            AND (s.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%') OR p.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%'))
+            AND (s.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%') AND r.scr_receive_company_id = #{paramMap.companyId})
+            OR (p.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%') AND r.scr_launch_company_id = #{paramMap.companyId})
         </if>
         <if test="paramMap.scrType != null and paramMap.scrType != '' and paramMap.scrType == '00' ">
             AND ((r.scr_launch_company_id = #{paramMap.companyId} AND r.scr_launch_type = '01')