소스 검색

申请记录、充值列表,销售权限 优化

zhaoxian 2 년 전
부모
커밋
0d5f3f7f6c

+ 4 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentApplicationController.java

@@ -52,16 +52,16 @@ public class FinancePaymentApplicationController {
         QueryWrapper<FinancePaymentApplication> queryWrapper = QueryGenerator.initQueryWrapper(new FinancePaymentApplication(), req.getParameterMap());
         //查询用户角色
         String roleCode = sysRoleService.getRoleCodeByUserId(application.getUserId());
-        if ("sale".equals(roleCode) || "saleAssistant".equals(roleCode) || "saleAm".equals(roleCode)) {
+
+        if ("saleAssistant".equals(roleCode)) {
             if ("4f6454dbad954a8094013bf4c6d74796".equals(application.getUserId())) {
-                /*销售助理 曹媛:侯加鑫、王维新、高洪哲             */
+                /*销售助理 曹媛 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                 List<String> userIds = new ArrayList<>();
                 userIds.add("4f6454dbad954a8094013bf4c6d74796");
                 userIds.add("42e137a90ca94cbfa89b21b306cb2e78");//侯加鑫
                 userIds.add("959842590bfc4ad38e0aced255177ced");//王维新
                 userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                 queryWrapper.in("applicanter_id", userIds);
-
             } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(application.getUserId())) {
                 /*销售助理 陈心瑞:崔泽、王明雨                 */
                 List<String> userIds = new ArrayList<>();
@@ -73,6 +73,7 @@ public class FinancePaymentApplicationController {
                 queryWrapper.eq("applicanter_id", application.getUserId());
             }
         }
+
         if (!Check.isNull(application.getAuditRole())) {
             queryWrapper.like("audit_status", "1");
             if ("finance".equals(application.getAuditRole())) {

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentRechargeApplicationController.java

@@ -51,7 +51,7 @@ public class FinancePaymentRechargeApplicationController {
         try {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(recharge.getUserId());
-            if ("sale".equals(roleCode) || "saleAssistant".equals(roleCode) || "saleAm".equals(roleCode)) {
+            if ("saleAssistant".equals(roleCode)) {
                 if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId())) {
                     /*销售助理 曹媛 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */