Преглед на файлове

Merge remote-tracking branch 'origin/test' into test

syh преди 5 години
родител
ревизия
16cbf7b622
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -170,7 +170,7 @@ public class UserAllocationController {
 
             String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
             if (!"admin".equals(roleCode) && !"kuaishouOperationManager".equals(roleCode)
-                    && !"kuaishouOperationManager".equals(roleCode) && !"designTeamLeader".equals(roleCode)) {
+                    && !"kuaishouOperationManager".equals(roleCode) && !"designTeamLeader".equals(roleCode) && !"touTiaoOperationManager".equals(roleCode)) {
                 queryWrapper.eq("user_id", userId);
             }
             queryWrapper.orderByDesc("create_time");