Browse Source

feat: 驿站人员增加“是否驿站站长”

zhangying 8 months ago
parent
commit
bcf526241d

+ 2 - 1
src/main/java/com/hz/employmentsite/controller/baseSettings/SiteUserController.java

@@ -96,7 +96,7 @@ public class SiteUserController {
                                @RequestParam(required = false) String siteID) throws Exception{
         PageInfo<SiteUserVo> result = userInfoService.getList(pageIndex, pageSize, siteUserIDList, siteUserName, siteID, null, null, null,null);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-        data.setTitles(Arrays.asList(new String[]{"序号", "工号", "人员名称", "角色", "性别", "联系电话", "年龄", "所属驿站"}));
+        data.setTitles(Arrays.asList(new String[]{"序号", "工号", "人员名称", "是否驿站站长", "角色", "性别", "联系电话", "年龄", "所属驿站"}));
         int i = 0;
         List<List<Object>> rowsData= new ArrayList();
         for (SiteUserVo item : result.getList()) {
@@ -105,6 +105,7 @@ public class SiteUserController {
             row.add(i);
             row.add(item.userNo);
             row.add(item.siteUserName);
+            row.add(item.isSiteAdmin);
             row.add(item.roleName);
             row.add(item.genderName);
             row.add(item.mobile);

+ 2 - 0
src/main/java/com/hz/employmentsite/vo/baseSettings/SiteUserVo.java

@@ -65,4 +65,6 @@ public class SiteUserVo {
     // 导入时的报错信息
     public String errorMessage;
 
+    public String isSiteAdmin;
+
 }

+ 3 - 1
src/main/resources/mapping/cquery/SiteUserCQuery.xml

@@ -6,7 +6,8 @@
         ,inSites.InstitutionID as institutionID,site.regionCode, dic_fullTime.Name as isFullTimeName
         ,occ_cat.OccupationalName as occupationalCategoryName, dic_occ_level.Name as occupationalLevelName
         ,dic_nation.Name as nationName, dic_politicsStatus.Name as politicsStatusName
-        ,dic_culture.Name as cultureRankName, updateUser.Name as updateUserName,curUser.RecordStatus
+        ,dic_culture.Name as cultureRankName, updateUser.Name as updateUserName,curUser.RecordStatus,
+        IF(userRole.RoleID IS NOT NULL,'是','否') AS isSiteAdmin
         from pc_site_user siteUser
         left join pc_site site on siteUser.siteID = site.siteID
         left join (select * from sys_dictionary_item where DictionaryCode ='UserType' ) dic_userRole on siteUser.RoleID = dic_userRole.Value
@@ -21,6 +22,7 @@
         left join pc_institution institution on inSites.institutionID = institution.InstitutionID
         left join sys_user updateUser on siteUser.UpdateBy = updateUser.UserID
         left join sys_user curUser on siteUser.UserID = curUser.UserID
+        LEFT JOIN ( SELECT UserID, RoleID FROM sys_user_sys_role WHERE RoleID IN ( SELECT RoleID FROM sys_role WHERE `Name` = '驿站站长' ) ) userRole ON siteUser.UserID = userRole.UserID
         where 1=1
         <if test="siteUserIDList!='' and siteUserIDList!=null">
             and siteUserID in (${siteUserIDList})

+ 1 - 0
vue/src/views/baseSettings/siteUser/index.vue

@@ -131,6 +131,7 @@ export default defineComponent({
       },
       {title: '工号', dataIndex: 'userNo', key: 'userNo', align: "center"},
       {title: '人员名称', dataIndex: 'siteUserName', key: 'siteUserName', align: "center"},
+      {title: '是否驿站站长', dataIndex: 'isSiteAdmin', key: 'isSiteAdmin', align: "center"},
       {title: '性别', dataIndex: 'genderName', key: 'genderName', align: "center"},
       {title: '联系电话', dataIndex: 'mobile', key: 'mobile', align: "center"},
       {