部门 员工获取 删除时的员工部门转移

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -59,7 +59,7 @@ public class UserController {
 
     /**
      * 获取员工的列表
-     * departmentId 检索的部门id
+     * departmentId 检索的部门id -1为全部 0为其他
      * pageIndex 页面索引
      * pageSize 页面大小
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -84,7 +84,7 @@ public class User extends Model<User> {
     /**
      * 部门表外键
      */
-    @TableField(value = "department_id", strategy = FieldStrategy.IGNORED)
+    @TableField("department_id")
     private Integer departmentId;
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -3,6 +3,7 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.Department;
+import com.management.platform.entity.User;
 import com.management.platform.entity.vo.DepartmentVO;
 import com.management.platform.mapper.DepartmentMapper;
 import com.management.platform.mapper.UserMapper;
@@ -102,6 +103,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             } else {
                 if (departmentMapper.deleteById(department) == 0) {
                     httpRespMsg.setError("修改失败");
+                } else {
+                    userMapper.update(new User().setDepartmentId(0), new QueryWrapper<User>()
+                            .eq("company_id", companyId)
+                            .eq("department_id", departmentId));
                 }
             }
         } catch (NullPointerException e) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -84,7 +84,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //还要多返回一个公司名字
             userVO.setPassword("");
             LocalDateTime remainingTime = company.getExpirationDate() == null ? LocalDateTime.now() : company.getExpirationDate();
-            userVO.setRemainingTime(remainingTime.toInstant(ZoneOffset.of("+8")).toEpochMilli() - LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+            userVO.setRemainingTime(remainingTime.toInstant(ZoneOffset.of("+8")).toEpochMilli() -
+                    LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
             httpRespMsg.data = userVO;
         } else {
             httpRespMsg.setError("密码错误");
@@ -127,7 +128,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             BeanUtils.copyProperties(userList.get(0), userVO);
             //还要多返回一个公司名字
             LocalDateTime remainingTime = company.getExpirationDate() == null ? LocalDateTime.now() : company.getExpirationDate();
-            userVO.setRemainingTime(remainingTime.toInstant(ZoneOffset.of("+8")).toEpochMilli() - LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+            userVO.setRemainingTime(remainingTime.toInstant(ZoneOffset.of("+8")).toEpochMilli() -
+                    LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
             userVO.setPassword("");
             httpRespMsg.data = userVO;
         } else {
@@ -156,8 +158,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User requester = userMapper.selectById(request.getHeader("Token"));
-            httpRespMsg.data = userMapper.selectPage(new Page<>(pageIndex, pageSize), new QueryWrapper<User>()
-                    .eq("company_id", requester.getCompanyId()));
+            QueryWrapper<User> queryWrapper = new QueryWrapper<User>().eq("company_id", requester.getCompanyId());
+            if (departmentId != -1) {
+                queryWrapper.eq("department_id", departmentId);
+            }
+            httpRespMsg.data = userMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
@@ -225,7 +230,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             Company company = new Company().setCompanyName(companyName)
                     .setExpirationDate(LocalDateTime.now().plusDays(3));
             companyMapper.insert(company);
-            if (userMapper.selectCount(new QueryWrapper<User>().eq("company_id", company.getId())) >= (companyMapper.selectById(company.getId()).getStaffCountMax())) {
+            if (userMapper.selectCount(new QueryWrapper<User>().eq("company_id", company.getId())) >=
+                    (companyMapper.selectById(company.getId()).getStaffCountMax())) {
                 httpRespMsg.setError("公司人员已达上限");
                 return httpRespMsg;
             }