浏览代码

Merge remote-tracking branch 'origin/master'

zxa 3 年之前
父节点
当前提交
dfc11b7ac1

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

@@ -1337,7 +1337,7 @@ public class SysUserController {
             userCompanyQueryWrapper.last("limit 1");
             userCompanyQueryWrapper.last("limit 1");
             UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
             UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
             String companyId = userCompany.getCompanyId();
             String companyId = userCompany.getCompanyId();
-            if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
+            if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId) || "5e46b5dea3d740eeb8ff1a2895015a4b".equals(companyId)) {
                 userList = sysUserService.getAllSales();
                 userList = sysUserService.getAllSales();
             } else {
             } else {
                 userList = sysUserService.getAllSalesByCompanyId(companyId);
                 userList = sysUserService.getAllSalesByCompanyId(companyId);