人员重新启用更新离职日期

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

@@ -1815,10 +1815,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //msg.setError("公司人员已达上限,无法启用");
             msg.setError(MessageUtils.message("register.fullError"));
         } else {
-            User setUser = new User();
-            setUser.setId(id);
-            setUser.setIsActive(isActive);
-            userMapper.updateById(setUser);
+//            User setUser = new User();
+//            setUser.setId(id);
+//            setUser.setIsActive(isActive);
+//            userMapper.updateById(setUser);
+            List<String> array=new ArrayList<>();
+            array.add(id);
+            userMapper.updateActiveByIds(array,1);
         }
 
         return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserMapper.xml

@@ -279,7 +279,7 @@
     </select>
 
     <update id="updateActiveByIds">
-        update user set is_active=1 WHERE id IN
+        update user set is_active=1,inactive_date=NULL WHERE id IN
         <foreach collection="array" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>