Explorar o código

政策-修改

yangzian %!s(int64=3) %!d(string=hai) anos
pai
achega
16d20eaf52

+ 1 - 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -217,7 +217,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/kuaishou/batch/*", "anon");
         filterChainDefinitionMap.put("/dimension/kuaiShouDimensionAccount/*", "anon");
         filterChainDefinitionMap.put("/ai/projectCreate/*", "anon");
-        filterChainDefinitionMap.put("/cwjsPolicyInfo/**", "anon");
+        //filterChainDefinitionMap.put("/cwjsPolicyInfo/**", "anon");
         filterChainDefinitionMap.put("/ruleIndicator/**", "anon");
         filterChainDefinitionMap.put("/explores/**", "anon");
         filterChainDefinitionMap.put("/estimatePeopleNumber/**", "anon");

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

@@ -276,7 +276,8 @@ public class CwjsPolicyInfoController {
 			if(userIds.contains(userId) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
                 cwjsPolicy.setOperation("查看|编辑|提交审核");
             }
-			if(userIds.contains(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
+
+			if(userId.equals(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
                 cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
             }
 			// 用户 公司
@@ -377,19 +378,25 @@ public class CwjsPolicyInfoController {
 					cwjsPolicyInfo.setApprovedProgress(cwjsCompanyApprovalUser.getApprovalUserId());
 				}
 			});
-			//如果满足有审核人员等于当前创建的人,并且
-			cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
-				if(cwjsCompanyApprovalUser.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfo.getCreateUserId())){
-					CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel()+1);
-					if(Check.isNull(approvalUserNext)){
-						cwjsPolicyInfo.setApprovedStatus(3);
-						cwjsPolicyInfo.setApprovedProgress(null);
-					}else{
-						cwjsPolicyInfo.setApprovedStatus(2);
-						cwjsPolicyInfo.setApprovedProgress(approvalUserNext.getApprovalUserId());
+			//如果满足有审核人员等于当前创建的人,
+			//当前用户 和 选择的销售(创建人) 相同
+			LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			if(user.getId().equals(cwjsPolicyInfo.getCreateUserId())){
+				cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
+					if(cwjsCompanyApprovalUser.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfo.getCreateUserId())){
+						CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel()+1);
+						if(Check.isNull(approvalUserNext)){
+							cwjsPolicyInfo.setApprovedStatus(3);
+							cwjsPolicyInfo.setApprovedProgress(null);
+						}else{
+							cwjsPolicyInfo.setApprovedStatus(2);
+							cwjsPolicyInfo.setApprovedProgress(approvalUserNext.getApprovalUserId());
+						}
 					}
-				}
-			});
+				});
+			}
+
+
 
 			if(cwjsPolicyInfo.getAdvancePay() == 1){
 				cwjsPolicyInfo.setIsDianPay(null);

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsSaleAssistantInfoController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.util.oConvertUtils;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -75,6 +76,7 @@ public class CwjsSaleAssistantInfoController {
 															  HttpServletRequest req) {
 		Result<IPage<CwjsSaleAssistantInfo>> result = new Result<>();
 		QueryWrapper<CwjsSaleAssistantInfo> queryWrapper = QueryGenerator.initQueryWrapper(cwjsSaleAssistantInfo, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<CwjsSaleAssistantInfo> page = new Page<CwjsSaleAssistantInfo>(pageNo, pageSize);
 		IPage<CwjsSaleAssistantInfo> pageList = cwjsSaleAssistantInfoService.page(page, queryWrapper);
 		result.setSuccess(true);

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

@@ -8,7 +8,7 @@
         select * from ctop_cwjs_company_approval_user where approval_user_id = #{userId}
     </select>
     <select id="queryByCompanySubjectId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
-        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId}
+        select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} 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}