Merge remote-tracking branch 'origin/master'

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

@@ -1815,13 +1815,10 @@ 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);
-            List<String> array=new ArrayList<>();
-            array.add(id);
-            userMapper.updateActiveByIds(array,1);
+            User setUser = new User();
+            setUser.setId(id);
+            setUser.setIsActive(isActive);
+            userMapper.updateById(setUser);
         }
 
         return msg;

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

@@ -1726,7 +1726,7 @@
         AND report.company_id=#{companyId}
         AND
         (
-        IF(user.induction_date is not null AND user.induction_date > #{startDate} and user.inactive_date is not null AND user.inactive_date < #{endDate}
+        IF(user.induction_date is not null AND user.induction_date > #{startDate} and user.inactive_date is not null AND user.`is_active`=0 AND user.inactive_date < #{endDate}
         ,report.create_date BETWEEN user.induction_date AND user.inactive_date
         ,report.create_date BETWEEN #{startDate} AND #{endDate} )
         and
@@ -1734,7 +1734,7 @@
         ,report.create_date BETWEEN user.induction_date AND #{endDate}
         ,report.create_date BETWEEN #{startDate} AND #{endDate} )
         and
-        IF(user.inactive_date is not null AND user.inactive_date < #{endDate}
+        IF(user.inactive_date AND user.`is_active`=0 is not null AND user.inactive_date < #{endDate}
         ,report.create_date BETWEEN #{startDate} AND user.inactive_date
         ,report.create_date BETWEEN #{startDate} AND #{endDate} )
         )

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

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

fhKeeper/formulahousekeeper/timesheet_h5/src/views/editPerfect/editPerfect.vue

@@ -29,7 +29,7 @@ export default {
         editPerfectJobNumber() {
             const { id } = this.user
             this.$axios.post("/user/updateUserJobNumber", {
-                id,
+                userId:id,
                 jobNumber: this.jobNumber
             })
             .then(res => {