Procházet zdrojové kódy

Merge branch 'test'

yangzian před 3 roky
rodič
revize
b6784db2fe

+ 3 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -147,9 +147,10 @@ public class CwjsPolicyInfoController {
 					 cwjsPolicyInfoEntity.setApprovedProgress(cwjsCompanyApprovalUser2.getApprovalUserId());
 				 }
 			 });
-			 //如果满足有审核人员等于当前创建的人,并且
+			 //如果满足 当前用户 是 审核人员 且 创建人
 			 cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser2 -> {
-				 if(cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfoEntity.getCreateUserId())){
+				 if(cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfoEntity.getCreateUserId())
+						 && cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(userId)){
 					 CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser2.getLevel()+1);
 					 if(Check.isNull(approvalUserNext)){
 						 cwjsPolicyInfoEntity.setApprovedStatus(3);

+ 3 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsCompanyApprovalUserMapper.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.ctop.finance.policy.mapper.CwjsCompanyApprovalUserMapper">
     <select id="queryByCompanySubjectIdAndUserId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
-        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and approval_user_id = #{userId}  limit 1
+        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and approval_user_id = #{userId} and del_flag = 0 limit 1
     </select>
     <select id="queryByUserId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
         select * from ctop_cwjs_company_approval_user where approval_user_id = #{userId} and del_flag = 0
     </select>
     <select id="queryByCompanySubjectId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
-        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} ORDER BY level
+        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and del_flag = 0 ORDER BY level
     </select>
     <select id="queryByCompanySubjectIdAndLevel" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
-        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and level = #{level}
+        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and level = #{level} and del_flag = 0
     </select>
 
 

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsSaleAssistantInfoMapper.xml

@@ -71,6 +71,7 @@
         FROM
             ctop_cwjs_sale_assistant_info u
             where u.sale_id = #{userId}
+        and del_flag = 0
         GROUP BY u.id;
     </select>
 

+ 4 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsSaleAssistantInfoServiceImpl.java

@@ -100,6 +100,10 @@ public class CwjsSaleAssistantInfoServiceImpl extends ServiceImpl<CwjsSaleAssist
             //助理
             saleList = cwjsSaleAssistantInfoMapper.getAssistantList(userId);
         }
+        //如果为空 添加自己的id
+        if (Check.isNull(saleList)){
+            saleList.add(new CwjsSaleAssistantInfo().setSaleId(userId));
+        }
         return saleList;
     }