瀏覽代碼

Merge remote-tracking branch 'origin/master'

yumeng 1 年之前
父節點
當前提交
e5fd29c0ed

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

@@ -54,7 +54,8 @@ public class FinancePaymentApplicationController {
         String roleCode = sysRoleService.getRoleCodeByUserId(application.getUserId());
 
         if ("saleAssistant".equals(roleCode)) {
-            if ("4f6454dbad954a8094013bf4c6d74796".equals(application.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(application.getUserId())) {
+            if ("4f6454dbad954a8094013bf4c6d74796".equals(application.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(application.getUserId())
+                    || "515b962ad5544991b17e744df2b87bab".equals(application.getUserId())) {
                 /*销售助理 曹媛组 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                 List<String> userIds = new ArrayList<>();
                 userIds.add("4f6454dbad954a8094013bf4c6d74796");
@@ -62,6 +63,7 @@ public class FinancePaymentApplicationController {
                 userIds.add("959842590bfc4ad38e0aced255177ced");//王维新
                 userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                 userIds.add("f33798b117a3486a9fae7ba0dab2e0be");//赵欣
+                userIds.add("515b962ad5544991b17e744df2b87bab");//支春雨
                 queryWrapper.in("applicanter_id", userIds);
             } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(application.getUserId())) {
                 /*销售助理 陈心瑞组:崔泽、王明雨                 */

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

@@ -56,7 +56,8 @@ public class FinancePaymentRechargeApplicationController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(recharge.getUserId());
             if ("saleAssistant".equals(roleCode)) {
-                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())) {
+                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())
+                        || "515b962ad5544991b17e744df2b87bab".equals(recharge.getUserId())) {
                     /*销售助理 曹媛组 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                     List<String> userIds = new ArrayList<>();
                     userIds.add("4f6454dbad954a8094013bf4c6d74796");
@@ -64,6 +65,7 @@ public class FinancePaymentRechargeApplicationController {
                     userIds.add("959842590bfc4ad38e0aced255177ced");//王维新
                     userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                     userIds.add("f33798b117a3486a9fae7ba0dab2e0be");//赵欣
+                    userIds.add("515b962ad5544991b17e744df2b87bab");//支春雨
                     recharge.setUserIds(userIds);
                 } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(recharge.getUserId())) {
                     /*销售助理 陈心瑞组:崔泽、王明雨                 */
@@ -243,7 +245,8 @@ public class FinancePaymentRechargeApplicationController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(recharge.getUserId());
             if ("saleAssistant".equals(roleCode)) {
-                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())) {
+                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())
+                        || "515b962ad5544991b17e744df2b87bab".equals(recharge.getUserId())) {
                     /*销售助理 曹媛 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                     List<String> userIds = new ArrayList<>();
                     userIds.add("4f6454dbad954a8094013bf4c6d74796");
@@ -251,6 +254,7 @@ public class FinancePaymentRechargeApplicationController {
                     userIds.add("959842590bfc4ad38e0aced255177ced");//王维新
                     userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                     userIds.add("f33798b117a3486a9fae7ba0dab2e0be");//赵欣
+                    userIds.add("515b962ad5544991b17e744df2b87bab");//支春雨
                     recharge.setUserIds(userIds);
                 } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(recharge.getUserId())) {
                     /*销售助理 陈心瑞:崔泽、王明雨                 */

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -14,7 +14,7 @@
                  UNION ALL
                  SELECT t1.audit_status,
                         IFNULL(t1.revieweder_id, '-'),
-                        IFNULL(t1.revieweder, '-'),application
+                        IFNULL(t1.revieweder, '-'),
                         CASE
                             WHEN revieweder_id like'financ%' THEN '财务审核'
                             WHEN revieweder_id ='meidaManager' THEN '媒介'