Added api /user/department

Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java

@@ -66,7 +66,6 @@ public class AttendanceController {
         attendance.setModifyId(1652714496280469506L);
         return attendanceService.saveOrUpdate(attendance) ? ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", attendance) :
                 ResponseResult.build(ResponseCode.DATABASE_SAVE_ERROR, "error", null);
-
     }
 
     //个人签到

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java

@@ -46,6 +46,13 @@ public class UserController {
         return ResponseResult.databaseSelectSuccess(userService.getAffairUser());
     }
 
+    @GetMapping("/department")
+    @PreAuthorize("hasAuthority('attendance:manage:modify')")
+    @Operation(summary = "获取同部门下所有用户")
+    public ResponseResult<List<User>> getDepartmentUser() {
+        return ResponseResult.databaseSaveSuccess(userService.getDepartmentUser());
+    }
+
     @GetMapping
     @PreAuthorize("hasAnyAuthority('system:user:all', 'system:user:add', 'system:user:modify')")
     @Operation(summary = "获取所有用户（权限管理相关）")

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java

@@ -21,6 +21,8 @@ public interface UserMapper extends BaseMapper<User> {
 
     List<User> getAllAffairUser();
 
+    List<User> getAllDepartmentUser(@Param("departmentId")long departmentId);
+
     User getOneById(@Param("id") long id);
 
     User getOneWithPowerByUsername(@Param("username") String username);

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java

@@ -19,6 +19,8 @@ public interface IUserService extends IService<User> {
 
     List<User> getAffairUser();
 
+    List<User> getDepartmentUser();
+
     List<User> getAllUser();
 
     User getUser(long id);

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java

@@ -78,6 +78,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return userMapper.getAllAffairUser();
     }
 
+    @Override
+    public List<User> getDepartmentUser() {
+        Long departmentId = WebUtil.getLoginUser().getUser().getDepartmentId();
+        if (departmentId == null) {
+            return List.of();
+        }
+        return userMapper.getAllDepartmentUser(departmentId);
+    }
+
     @Override
     public List<User> getAllUser() {
         List<User> users = userMapper.getAll();

Pinnacle/src/main/resources/mapper/permission/UserMapper.xml

@@ -32,6 +32,7 @@
                  left join (select * from t_group where deleted = 0) as tg on tg.id = tug.group_id
         where t_user.deleted = 0;
     </select>
+
     <select id="getOneById" resultMap="userMap">
         select t_user.id            as user_id,
                t_user.username      as user_username,
@@ -63,6 +64,7 @@
         where t_user.deleted = 0
           and t_user.id = #{id};
     </select>
+
     <select id="getOneWithPowerByUsername" resultMap="userWithPowerMap">
         select distinct t_user.id            as user_id,
                         t_user.username      as user_username,
@@ -106,6 +108,7 @@
         where t_user.deleted = 0
           and t_user.username = #{username};
     </select>
+
     <select id="getAllAffairUser" resultMap="userMap">
         select t_user.id            as user_id,
                t_user.username      as user_username,
@@ -142,6 +145,42 @@
           and t.code = 'affair:manage:modify';
     </select>
 
+    <select id="getAllDepartmentUser" resultMap="userMap">
+        select t_user.id            as user_id,
+               t_user.username      as user_username,
+               t_user.department_id as user_department_id,
+               t_user.enable        as user_enable,
+               t_user.deleted       as user_deleted,
+               t_user.version       as user_version,
+               ts.id                as staff_id,
+               ts.first_name        as staff_first_name,
+               ts.last_name         as staff_last_name,
+               ts.deleted           as staff_deleted,
+               ts.version           as staff_version,
+               tr.id                as role_id,
+               tr.enable            as role_enable,
+               tr.name              as role_name,
+               tr.deleted           as role_deleted,
+               tr.version           as role_version,
+               tg.id                as group_id,
+               tg.name              as group_name,
+               tg.enable            as group_enable,
+               tg.deleted           as group_deleted,
+               tg.version           as group_version
+        from t_user
+                 left join (select * from t_staff where deleted = 0) as ts on ts.user_id = t_user.id
+                 left join (select * from t_user_role where deleted = 0) as tur on t_user.id = tur.user_id
+                 left join (select * from t_role where deleted = 0) as tr on tr.id = tur.role_id
+                 left join (select * from t_user_group where deleted = 0) as tug on t_user.id = tug.user_id
+                 left join (select * from t_group where deleted = 0) as tg on tg.id = tug.group_id
+                 left join (select * from t_power_role where deleted = 0) as tpr on tpr.role_id = tr.id
+                 left join t_power as tp on tp.id = tpr.power_id
+                 left join (select * from t_operation) as t on t.power_id = tp.id
+        where t_user.deleted = 0
+          and t_user.id != 1
+          and t_user.department_id = #{departmentId};
+    </select>
+
     <resultMap id="userMap" type="user">
         <id property="id" column="user_id"/>
         <result property="username" column="user_username"/>

ui/src/components/work/EditWork.vue

@@ -43,6 +43,7 @@
 
 <script lang="ts">
 import request from '@/services'
+import _ from 'lodash'
 export default {
     props: {
         editForm: {
@@ -94,7 +95,7 @@ export default {
     methods: {
         getFormData() {
             request
-                .get('/user')
+                .get('/user/department')
                 .then((response) => {
                     console.log(response.data.data)
                     this.workers = response.data.data
@@ -110,7 +111,7 @@ export default {
                 if (value) {
                     console.log(form.deadline)
                     console.log(typeof form.deadline)
-                    form.publisherId = String(1)
+                    form.publisherId = _.toString(1)
                     if (this.editForm) {
                         this.$emit('updateWork', form)
                         this.reset()

ui/src/pages/attendance/AttendanceHome.vue

@@ -230,7 +230,7 @@ export default {
         // 获取所有user信息
         getFormData() {
             request
-                .get('/user')
+                .get('/user/department')
                 .then((response) => {
                     this.users = response.data.data
                 })