客户登记拥有人,项目组成员树

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -129,6 +129,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Resource
     private CwProjectRecordsService cwProjectRecordsService;
 
+    @Resource
+    private CwSignatureAnnotatorMapper cwSignatureAnnotatorMapper;
+
 
     /**
      * 保存项目以及其他相关信息
@@ -3237,7 +3240,30 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
         }*/
         return "修改成功";
+    }
 
+    public List<CwSignatureAnnotator> getSignatureAnnotatorList(String reportId) {
+        return cwProjectReportSignatureMapper.getSignatureAnnotatorList(reportId);
     }
 
+    public String saveSignatureAnnotator(CwProjectReportData reportData) {
+        CwProjectReport report = cwProjectReportService.getById(reportData.getId());
+        if (ObjectUtil.isNotEmpty(report)){
+            //修改报告表中的签字注师
+            report.setSignatureAnnotatorStatus(reportData.getSignatureAnnotatorStatus());
+            report.setSignatureAnnotator1(reportData.getSignatureAnnotator1());
+            report.setSignatureAnnotator2(reportData.getSignatureAnnotator2());
+            reportMapper.updateById(report);
+            //将信息添加到签字注师记录表中
+            CwSignatureAnnotator cwSignatureAnnotator = new CwSignatureAnnotator();
+            cwSignatureAnnotator.setReportId(reportData.getId());
+            cwSignatureAnnotator.setSignatureAnnotator1(reportData.getSignatureAnnotator1());
+            cwSignatureAnnotator.setSignatureAnnotator2(reportData.getSignatureAnnotator2());
+            cwSignatureAnnotator.setUserName(report.getCreateName());
+            cwSignatureAnnotatorMapper.insert(cwSignatureAnnotator);
+        }else {
+            return reportData.getId();
+        }
+        return reportData.getId();
+    }
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/controller/CwWorkClientController.java

@@ -59,6 +59,7 @@ public class CwWorkClientController {
     @Resource
     private CwWorkClientBillingService cwWorkClientBillingService;
 
+
     /**
      * 查询客户信息列表
      * @param cwWorkClientBaseDTO
@@ -103,7 +104,8 @@ public class CwWorkClientController {
                         li.setCreateBy(createBy);
                     }
                 }
-            } else if (StringUtils.isBlank(li.getUpdateUserName())) {
+            }
+            if (StringUtils.isBlank(li.getUpdateUserName())) {
                 if (StringUtils.isNotBlank(li.getUpdateUser())){
                     UserDTO matchingUser = null;
                     for (UserDTO user : finalAllUserInfo) {

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -243,9 +243,8 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         if (!SecurityUtils.getCurrentUserDTO ( ).isAdmin ( )){
             //根据当前人的所属公司查该公司下的所有人员信息
             UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
-            if (userDTO.getCompanyDTO().getName().contains("评估")||userDTO.getCompanyDTO().getName().contains("会计")){
-                queryWrapper.eq ( "a.company_id", userDTO.getCompanyDTO().getId() );
-            }
+            queryWrapper.eq ( "a.company_id", userDTO.getCompanyDTO().getId() );
+
         }
         return baseMapper.findList ( page, queryWrapper );