From c563daaace01918b9d036737ad586e8882e0378f Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Mon, 18 Jul 2022 10:58:09 +0800
Subject: [PATCH] zh

---
 .../zh/project0512/controller/manage/UserController.java | 2 +-
 src/main/java/com/zh/project0512/model/Admin.java        | 4 ++--
 .../serviceImpl/AdminJurisdictionServiceImpl.java        | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/UserController.java b/src/main/java/com/zh/project0512/controller/manage/UserController.java
index ff4adca..03bded5 100644
--- a/src/main/java/com/zh/project0512/controller/manage/UserController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/UserController.java
@@ -214,7 +214,7 @@ public class UserController {
         return Result.success(qywxDepartmentService.list(MybatisPlusUtil.SetPage(obj)));
     }
 
-    @Operation(summary = "刷新企业部门信息", description = "当企业微信架构改动更新时，需手动触发同步信息")
+    @Operation(summary = "同步企业微信部门信息", description = "当企业微信架构改动更新时，需手动触发同步信息")
     @PostMapping("/departmentRefresh")
     @AdminTokenValid
     public Result departmentRefresh() {
diff --git a/src/main/java/com/zh/project0512/model/Admin.java b/src/main/java/com/zh/project0512/model/Admin.java
index b1d8d87..6c52c74 100644
--- a/src/main/java/com/zh/project0512/model/Admin.java
+++ b/src/main/java/com/zh/project0512/model/Admin.java
@@ -91,9 +91,9 @@ public class Admin extends Model {
     private Integer status;
 
     /**
-     * 角色id，用,分隔
+     * 角色id，'用,分隔'
      */
     @TableField("roleIds")
-    private String roleIds;
+    private Integer roleIds;
 
 }
diff --git a/src/main/java/com/zh/project0512/serviceImpl/AdminJurisdictionServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/AdminJurisdictionServiceImpl.java
index f1be283..8a068d7 100644
--- a/src/main/java/com/zh/project0512/serviceImpl/AdminJurisdictionServiceImpl.java
+++ b/src/main/java/com/zh/project0512/serviceImpl/AdminJurisdictionServiceImpl.java
@@ -83,11 +83,12 @@ public class AdminJurisdictionServiceImpl implements IAdminJurisdictionService {
                 List<AdminJurisdiction> adminJurisdictions = adminJurisdictionMapper.selectList(queryWrapper4);
                 if (adminJurisdictions != null && adminJurisdictions.size()>0){
                     for (AdminJurisdiction adminJurisdiction : adminJurisdictions) {
-                        AdminOperation adminOperation = adminOperationMapper.selectById(adminJurisdiction.getOperationId());
-                        if (adminOperation != null){
+//                        AdminOperation adminOperation = adminOperationMapper.selectById(adminJurisdiction.getOperationId());
+//                        if (adminOperation != null){
                             AdminJurisdictionFBRIOperationVo operationVo = new AdminJurisdictionFBRIOperationVo();
-                            PropertyUtils.copyProperties(adminOperation,operationVo);
+//                            PropertyUtils.copyProperties(adminOperation,operationVo);
                             operationVo.setId(adminJurisdiction.getId());
+                        operationVo.setName(adminJurisdiction.getRemake());
                             operationVo.setCheck(false);//默认为未选中
                             //查询该操作是否选中,如果选中则菜单也被选中
                             QueryWrapper<AdminRoleJurisdiction> queryWrapper5 = new QueryWrapper<>();
@@ -101,7 +102,7 @@ public class AdminJurisdictionServiceImpl implements IAdminJurisdictionService {
                             }
 
                             operationVoList.add(operationVo);
-                        }
+//                        }
                     }
                 }