ソースを参照

财务-政策

yangzian 3 年 前
コミット
2db8218729

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

@@ -329,7 +329,7 @@ public class CwjsPolicyInfoController {
             //政策的主体 不是 审核人的主体 过滤 只保留 和审核人 是一样的主体的 政策
 			cwjsPolicyInfoList.forEach(cwjsPolicy -> {
                 //if(!userIds.contains(cwjsPolicy.getCreateUserId()) && !userId.equalsIgnoreCase(cwjsPolicy.getApprovedProgress())){
-                if(!subList.contains(String.valueOf(cwjsPolicy.getCompanySubjectId()))){
+                if(!subList.contains(String.valueOf(cwjsPolicy.getCompanySubjectId())) && !userIds.contains(cwjsPolicy.getCreateUserId())){
                     removeList.add(cwjsPolicy);
                 }
             });

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

@@ -5,7 +5,7 @@
         select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and approval_user_id = #{userId}  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}
+        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