Преглед изворни кода

Merge remote-tracking branch 'origin/master'

yumeng пре 1 година
родитељ
комит
d36f5fc59c

+ 10 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -1075,15 +1075,19 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         }
 
         Map<String, BigDecimal> kuaishouMap = new HashMap<>();
-        for (int i = 0; i < kuaiShouCostList.size(); i++) {
-            JSONObject jsonObject = kuaiShouCostList.get(i);
-            kuaishouMap.put(jsonObject.getString("signature"), jsonObject.getBigDecimal("charges"));
+        if (!Check.isNull(kuaiShouCostList)) {
+            for (int i = 0; i < kuaiShouCostList.size(); i++) {
+                JSONObject jsonObject = kuaiShouCostList.get(i);
+                kuaishouMap.put(jsonObject.getString("signature"), jsonObject.getBigDecimal("charges"));
+            }
         }
 
         Map<String, BigDecimal> bytedanceMap = new HashMap<>();
-        for (int i = 0; i < bytedanceCostList.size(); i++) {
-            JSONObject jsonObject = bytedanceCostList.get(i);
-            bytedanceMap.put(jsonObject.getString("signature"), jsonObject.getBigDecimal("charges"));
+        if (!Check.isNull(bytedanceCostList)) {
+            for (int i = 0; i < bytedanceCostList.size(); i++) {
+                JSONObject jsonObject = bytedanceCostList.get(i);
+                bytedanceMap.put(jsonObject.getString("signature"), jsonObject.getBigDecimal("charges"));
+            }
         }
 
         for (int i = 0; i < setList.size(); i++) {

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

@@ -54,8 +54,11 @@ public class FinancePaymentApplicationController {
         String roleCode = sysRoleService.getRoleCodeByUserId(application.getUserId());
 
         if ("saleAssistant".equals(roleCode)) {
-            if ("4f6454dbad954a8094013bf4c6d74796".equals(application.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(application.getUserId())
-                    || "515b962ad5544991b17e744df2b87bab".equals(application.getUserId())) {
+            if ("4f6454dbad954a8094013bf4c6d74796".equals(application.getUserId())
+                    || "f33798b117a3486a9fae7ba0dab2e0be".equals(application.getUserId())
+                    || "515b962ad5544991b17e744df2b87bab".equals(application.getUserId())
+                    || "5c6abd3bc1d64a1aa365157f7edd3ecd".equals(application.getUserId())
+            ) {
                 /*销售助理 曹媛组 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                 List<String> userIds = new ArrayList<>();
                 userIds.add("4f6454dbad954a8094013bf4c6d74796");
@@ -64,13 +67,17 @@ public class FinancePaymentApplicationController {
                 userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                 userIds.add("f33798b117a3486a9fae7ba0dab2e0be");//赵欣
                 userIds.add("515b962ad5544991b17e744df2b87bab");//支春雨
+                userIds.add("5c6abd3bc1d64a1aa365157f7edd3ecd");//关蕊
                 queryWrapper.in("applicanter_id", userIds);
-            } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(application.getUserId())) {
+            } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(application.getUserId())
+                    || "e2d55e2888e849ed911bc89b72fc8211".equals(application.getUserId())
+            ) {
                 /*销售助理 陈心瑞组:崔泽、王明雨                 */
                 List<String> userIds = new ArrayList<>();
-                userIds.add("163a4cc9a72c425e873d36d08e75f2cd");
+                userIds.add("163a4cc9a72c425e873d36d08e75f2cd");//陈心瑞
                 userIds.add("fe4965692844468798e4fc265e3cdfc8");//崔泽
                 userIds.add("9a99a2e906b64f5082f87c3a60a20b2e");//王明雨
+                userIds.add("e2d55e2888e849ed911bc89b72fc8211");//支一淼
                 queryWrapper.in("applicanter_id", userIds);
             } else {
                 queryWrapper.eq("applicanter_id", application.getUserId());

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

@@ -56,8 +56,12 @@ public class FinancePaymentRechargeApplicationController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(recharge.getUserId());
             if ("saleAssistant".equals(roleCode)) {
-                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())
-                        || "515b962ad5544991b17e744df2b87bab".equals(recharge.getUserId())) {
+                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId())
+                        || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())
+                        || "515b962ad5544991b17e744df2b87bab".equals(recharge.getUserId())
+                        || "5c6abd3bc1d64a1aa365157f7edd3ecd".equals(recharge.getUserId())
+
+                ) {
                     /*销售助理 曹媛组 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                     List<String> userIds = new ArrayList<>();
                     userIds.add("4f6454dbad954a8094013bf4c6d74796");
@@ -66,13 +70,17 @@ public class FinancePaymentRechargeApplicationController {
                     userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                     userIds.add("f33798b117a3486a9fae7ba0dab2e0be");//赵欣
                     userIds.add("515b962ad5544991b17e744df2b87bab");//支春雨
+                    userIds.add("5c6abd3bc1d64a1aa365157f7edd3ecd");//关蕊
                     recharge.setUserIds(userIds);
-                } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(recharge.getUserId())) {
+                } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(recharge.getUserId())
+                        || "e2d55e2888e849ed911bc89b72fc8211".equals(recharge.getUserId())
+                ) {
                     /*销售助理 陈心瑞组:崔泽、王明雨                 */
                     List<String> userIds = new ArrayList<>();
                     userIds.add("163a4cc9a72c425e873d36d08e75f2cd");
                     userIds.add("fe4965692844468798e4fc265e3cdfc8");//崔泽
                     userIds.add("9a99a2e906b64f5082f87c3a60a20b2e");//王明雨
+                    userIds.add("e2d55e2888e849ed911bc89b72fc8211");//支一淼
                     recharge.setUserIds(userIds);
                 } else {
                     recharge.setApplicanterId(recharge.getUserId());
@@ -245,8 +253,11 @@ public class FinancePaymentRechargeApplicationController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(recharge.getUserId());
             if ("saleAssistant".equals(roleCode)) {
-                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId()) || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())
-                        || "515b962ad5544991b17e744df2b87bab".equals(recharge.getUserId())) {
+                if ("4f6454dbad954a8094013bf4c6d74796".equals(recharge.getUserId())
+                        || "f33798b117a3486a9fae7ba0dab2e0be".equals(recharge.getUserId())
+                        || "515b962ad5544991b17e744df2b87bab".equals(recharge.getUserId())
+                        || "5c6abd3bc1d64a1aa365157f7edd3ecd".equals(recharge.getUserId())
+                ) {
                     /*销售助理 曹媛 4f6454dbad954a8094013bf4c6d74796:侯加鑫、王维新、高洪哲             */
                     List<String> userIds = new ArrayList<>();
                     userIds.add("4f6454dbad954a8094013bf4c6d74796");
@@ -255,13 +266,17 @@ public class FinancePaymentRechargeApplicationController {
                     userIds.add("f0190eaabfb4488caa22e123e94dadc8");//高洪哲
                     userIds.add("f33798b117a3486a9fae7ba0dab2e0be");//赵欣
                     userIds.add("515b962ad5544991b17e744df2b87bab");//支春雨
+                    userIds.add("5c6abd3bc1d64a1aa365157f7edd3ecd");//关蕊
                     recharge.setUserIds(userIds);
-                } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(recharge.getUserId())) {
+                } else if ("163a4cc9a72c425e873d36d08e75f2cd".equals(recharge.getUserId())
+                        || "e2d55e2888e849ed911bc89b72fc8211".equals(recharge.getUserId())
+                ) {
                     /*销售助理 陈心瑞:崔泽、王明雨                 */
                     List<String> userIds = new ArrayList<>();
                     userIds.add("163a4cc9a72c425e873d36d08e75f2cd");
                     userIds.add("fe4965692844468798e4fc265e3cdfc8");//崔泽
                     userIds.add("9a99a2e906b64f5082f87c3a60a20b2e");//王明雨
+                    userIds.add("e2d55e2888e849ed911bc89b72fc8211");//支一淼
                     recharge.setUserIds(userIds);
                 } else {
                     recharge.setApplicanterId(recharge.getUserId());