基础框架发布: 8.2.46

1) 系统管理中用户管理模块增加按机构查询，且展示字段包含机构

前端核心框架发布: 8.2.140

io.sc.platform.system.api/src/main/java/io/sc/platform/system/api/user/UserVo.java

@@ -4,7 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.sc.platform.orm.api.types.DesensitizeStringWrapper;
 import io.sc.platform.orm.api.vo.CorporationAuditorVo;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 public class UserVo extends CorporationAuditorVo {
     //主键
@@ -47,28 +49,32 @@ public class UserVo extends CorporationAuditorVo {
     @JsonProperty(index = 10)
     private String defaultOrgId;
 
-    //email
+    //所属机构名称列表
     @JsonProperty(index = 11)
+    private List<String> orgNames =new ArrayList<>();
+
+    //email
+    @JsonProperty(index = 12)
     private String email;
 
     //电话
-    @JsonProperty(index = 12)
+    @JsonProperty(index = 13)
     private String phone;
 
     //手机号
-    @JsonProperty(index = 13)
+    @JsonProperty(index = 14)
     private String mobile;
 
     //微信号
-    @JsonProperty(index = 14)
+    @JsonProperty(index = 15)
     private String weixin;
 
     //QQ号
-    @JsonProperty(index = 15)
+    @JsonProperty(index = 16)
     private String qq;
 
     //最后读取公告的时间
-    @JsonProperty(index = 16)
+    @JsonProperty(index = 17)
     private Date lastReadAnnouncementDate;
 
     public String getId() {
@@ -151,6 +157,14 @@ public class UserVo extends CorporationAuditorVo {
         this.defaultOrgId = defaultOrgId;
     }
 
+    public List<String> getOrgNames() {
+        return orgNames;
+    }
+
+    public void setOrgNames(List<String> orgNames) {
+        this.orgNames = orgNames;
+    }
+
     public String getEmail() {
         return email;
     }

io.sc.platform.system.frontend/src/views/user/User.vue

@@ -16,6 +16,7 @@
             :query-form-fields="[
               { name: 'loginName', label: $t('loginName'), type: 'w-text' },
               { name: 'userName', label: $t('userName'), type: 'w-text' },
+              { name: 'orgs', label: $t('org'), type: 'w-org-select', multiple: true, autogrow: false, queryOperator: 'inSet' },
               { name: 'enable', label: $t('isEnable'), type: 'w-select', options: Options.yesNo(), queryOperator: 'equals' },
             ]"
             :toolbar-configure="{ noIcon: false }"
@@ -83,12 +84,26 @@
               'export',
             ]"
             :columns="[
-              { width: 200, name: 'loginName', label: $t('loginName') },
+              { width: 150, name: 'loginName', label: $t('loginName') },
-              { width: '100%', name: 'userName', label: $t('userName') },
+              { width: 150, name: 'userName', label: $t('userName') },
               {
-                width: 250,
+                width: '100%',
+                name: 'orgNames',
+                label: $t('org'),
+                html: true,
+                format: (value, row) => {
+                  let names = '';
+                  value.forEach((item) => {
+                    names += item + '<br/>';
+                  });
+                  return names;
+                },
+              },
+              {
+                width: 80,
                 name: 'enable',
                 label: $t('status'),
+                align: 'center',
                 format: (value, row) => {
                   return {
                     componentType: UserStatusTag,

io.sc.platform.system/src/main/java/io/sc/platform/system/user/jpa/entity/UserEntity.java

@@ -6,12 +6,15 @@ import io.sc.platform.orm.converter.NumericBooleanConverter;
 import io.sc.platform.orm.entity.CorporationAuditorEntity;
 import io.sc.platform.orm.entity.DesensitizedEntity;
 import io.sc.platform.orm.service.support.Desensitizer;
+import io.sc.platform.security.service.support.Org;
 import io.sc.platform.system.api.user.UserVo;
 import io.sc.platform.system.department.jpa.entity.DepartmentEntity;
 import io.sc.platform.system.org.jpa.entity.OrgEntity;
 import io.sc.platform.system.role.jpa.entity.RoleEntity;
 import io.sc.platform.system.user.convert.*;
 import io.sc.platform.system.user.jpa.support.UserEntityJsonSerializer;
+import io.sc.platform.util.ObjectMapperUtil;
+import io.sc.platform.util.StringUtil;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
 import org.hibernate.annotations.Type;
@@ -189,12 +192,20 @@ public class UserEntity extends CorporationAuditorEntity<UserVo> implements Dese
 		vo.setCredentialsExpired(this.getCredentialsExpired());
 		vo.setDefaultRoleId(this.getDefaultRoleId());
 		vo.setDefaultOrgId(this.getDefaultOrgId());
+		if(this.getOrgs()!=null && !this.getOrgs().isEmpty()){
+			List<String> orgNames =new ArrayList<>();
+			for(OrgEntity org : this.getOrgs()){
+				orgNames.add(org.getName());
+			}
+			vo.setOrgNames(orgNames);
+		}
 		vo.setEmail(this.getEmail());
 		vo.setPhone(this.getPhone());
 		vo.setMobile(this.getMobile());
 		vo.setWeixin(this.getWeixin());
 		vo.setQq(this.getQq());
 		vo.setLastReadAnnouncementDate(this.getLastReadAnnouncementDate());
+
 		return vo;
 	}