njs 2 years ago
parent
commit
eef12dd0f7

+ 1 - 1
suishenbang-admin/src/main/resources/application-prod.yml

@@ -105,7 +105,7 @@ spring:
 
 
   tms:
   tms:
     #TMS接口地址
     #TMS接口地址
-    tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
+    tmsUrl: https://lb.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
     tmsToken: EZS2020
     tmsToken: EZS2020
     suishenbang: http://suishenbang.nipponpaint.com.cn/oneportal
     suishenbang: http://suishenbang.nipponpaint.com.cn/oneportal
   mail:
   mail:

+ 7 - 7
suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -328,7 +328,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                 userOrderAuthorDiyList.addAll(diyrole);
                 userOrderAuthorDiyList.addAll(diyrole);
             }
             }
         }
         }
-/*
+
         //division
         //division
         //BMD-NVB2023T05
         //BMD-NVB2023T05
         List<SysUserOrderAuthor> userOrderAuthorBMDList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T05");
         List<SysUserOrderAuthor> userOrderAuthorBMDList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T05");
@@ -376,10 +376,10 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             }
             }
         }
         }
         //cw
         //cw
-       *//* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
+       /* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
         List<Long> cwauthList=userOrderAuthorCwList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<Long> cwauthList=userOrderAuthorCwList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> cwrole=sysUserOrderAuthorMapper.selectByParentId(cwauthList);
         List<SysUserOrderAuthor> cwrole=sysUserOrderAuthorMapper.selectByParentId(cwauthList);
-        userOrderAuthorCwList.addAll(cwrole);*//*
+        userOrderAuthorCwList.addAll(cwrole);*/
        //ysl
        //ysl
         List<SysUserOrderAuthor> userOrderAuthorYSLList = sysUserOrderAuthorMapper.selectAuthorIdByCode("YSL",null);
         List<SysUserOrderAuthor> userOrderAuthorYSLList = sysUserOrderAuthorMapper.selectAuthorIdByCode("YSL",null);
         if(userOrderAuthorYSLList !=null && userOrderAuthorYSLList.size()>0){
         if(userOrderAuthorYSLList !=null && userOrderAuthorYSLList.size()>0){
@@ -388,7 +388,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             if(yslrole !=null && yslrole.size()>0){
             if(yslrole !=null && yslrole.size()>0){
                 userOrderAuthorYSLList.addAll(yslrole);
                 userOrderAuthorYSLList.addAll(yslrole);
             }
             }
-        }*/
+        }
         //xls
         //xls
         List<SysUserOrderAuthor> userOrderAuthorXlsList = sysUserOrderAuthorMapper.selectAuthorIdByCode("XLS",null);
         List<SysUserOrderAuthor> userOrderAuthorXlsList = sysUserOrderAuthorMapper.selectAuthorIdByCode("XLS",null);
         if(userOrderAuthorXlsList !=null && userOrderAuthorXlsList.size()>0){
         if(userOrderAuthorXlsList !=null && userOrderAuthorXlsList.size()>0){
@@ -404,10 +404,10 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             if (sales != null) {
             if (sales != null) {
             int index = sales.indexOf("_");
             int index = sales.indexOf("_");
             String intNumber = sales.substring(0, index);
             String intNumber = sales.substring(0, index);
-          /*  if (intNumber.equals("cw")) {
+           /* if (intNumber.equals("cw")) {
                 userOrderAuthorList.clear();
                 userOrderAuthorList.clear();
                 userOrderAuthorList.addAll(userOrderAuthorCwList);
                 userOrderAuthorList.addAll(userOrderAuthorCwList);
-            } else*/ /*if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
+            } else*/ if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
                     || intNumber.equals("saledept") || intNumber.equals("suboffice")) {
                     || intNumber.equals("saledept") || intNumber.equals("suboffice")) {
                 userOrderAuthorList.clear();
                 userOrderAuthorList.clear();
                 roleAuth.clear();
                 roleAuth.clear();
@@ -431,7 +431,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                         userOrderAuthorList.addAll(userOrderAuthor36List);
                         userOrderAuthorList.addAll(userOrderAuthor36List);
                     }
                     }
 
 
-                }else */if(intNumber.equals("customer")){
+                }else if(intNumber.equals("customer")){
                     String isCustomerManager=sysUserExt.getIsCustomerManager();
                     String isCustomerManager=sysUserExt.getIsCustomerManager();
                     if(isCustomerManager !=null && !("").equals(isCustomerManager)){
                     if(isCustomerManager !=null && !("").equals(isCustomerManager)){
                         List<String> isManager =Arrays.asList(isCustomerManager.split(","));
                         List<String> isManager =Arrays.asList(isCustomerManager.split(","));