Ver Fonte

fix 修改新增发文返回用户姓名

Administrator há 4 anos atrás
pai
commit
61704d09fd

+ 4 - 9
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java

@@ -34,6 +34,7 @@ import com.boman.system.service.ISysConfigService;
 import com.boman.system.service.ISysUserService;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Size;
 
 
 /**
@@ -495,24 +496,18 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public AjaxResult getDeptNameAndRoleName(List<SysUser> sysUserList) {
         List<String> deptNameList = new ArrayList<>();
-        List<String> roleNameList = new ArrayList<>();
+        List<String> nikeNameList = new ArrayList<>();
         if (sysUserList.size() > 0){
             for (SysUser user : sysUserList) {
                 SysDept dept = user.getDept();
-                List<SysRole> roles = user.getRoles();
                 if (ObjectUtils.isNotEmpty(dept)){
                     String deptName = dept.getDeptName();
                     deptNameList.add(deptName);
                 }
-                if (roles.size() > 0){
-                    for (SysRole role : roles) {
-                        String roleName = role.getRoleName();
-                        roleNameList.add(roleName);
-                    }
-                }
+                nikeNameList.add(user.getNickName());
             }
         }
-        return AjaxResult.success().put("deptNameList",deptNameList).put("roleNameList",roleNameList);
+        return AjaxResult.success().put("deptNameList",deptNameList).put("nikeNameList",nikeNameList);
     }
 
     /**

+ 2 - 2
ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: 'OA管理系统',
-  urls: `http://118.31.23.65:7090`,
-  // urls: `http://192.168.101.11:8090`,
+  // urls: `http://118.31.23.65:7090`,
+  urls: `http://192.168.101.11:8090`,
    // urls: `http://192.168.101.110:8090`,
 
   /**