人员入职时间可置空

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -73,12 +73,20 @@ public class SysUserController extends BaseController
         List<SysUser> list = userService.selectUserList(user);
         // 如果指定了部门ID，根据备注中的部门信息添加用户
         if (user.getDeptId() != null) {
+            if (user.getDeptId() == 101L) {
+                list.addAll(postService.selectDsSecretary(user));
+            }
+            if (user.getDeptId() == 102L) {
+                list.addAll(postService.selectJyLeader(user));
+            }
+            if (user.getDeptId() == 103L) {
+                list = postService.selectGmAssistant(user);
+            }
             SysDept dept = deptService.selectDeptById(user.getDeptId());
             if (dept != null) {
                 // 查询所有用户
-                SysUser allUser = user;
-                allUser.setDeptId(null);
-                List<SysUser> allUsers = userService.selectUserList(allUser);
+                user.setDeptId(null);
+                List<SysUser> allUsers = userService.selectUserList(user);
                 for (SysUser sysUser : allUsers) {
                     // 检查用户备注中的部门信息
                     if (sysUser.getRemark() != null) {
@@ -96,15 +104,6 @@ public class SysUserController extends BaseController
                 }
             }
         }
-        if (user.getDeptId() != null && user.getDeptId() == 101L) {
-            list.addAll(postService.selectDsSecretary(user));
-        }
-        if (user.getDeptId() != null && user.getDeptId() == 102L) {
-            list.addAll(postService.selectJyLeader(user));
-        }
-        if (user.getDeptId() != null && user.getDeptId() == 103L) {
-            list = postService.selectGmAssistant(user);
-        }
         for (SysUser sysUser : list) {
             StringBuilder postName = new StringBuilder();
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
@@ -433,7 +432,9 @@ public class SysUserController extends BaseController
         user.setUpdateReason(user.getUpdateReason());
         if (user.getBirthday() != null)
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
-        if (user.getContractSign() == null || user.getContractExpire() == null) {
+        if (user.getContractSign() == null || user.getContractExpire() == null || user.getEntryDate() == null) {
+            if (user.getEntryDate() == null)
+                userService.updateUserEntryDate(user);
             if (user.getContractSign() == null)
                 userService.updateUserContractSign(user);
             if (user.getContractExpire() == null)

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -92,6 +92,14 @@ public interface SysUserMapper
      */
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
+    /**
+     * 修改用户入职日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserEntryDate(SysUser user);
+
     /**
      * 修改用户合同签订日期
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -160,6 +160,14 @@ public interface ISysUserService
      */
     public int updateUserStatus(SysUser user);
 
+    /**
+     * 修改用户入职日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserEntryDate(SysUser user);
+
     /**
      * 修改用户合同签订日期
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -350,6 +350,18 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.updateUser(user);
     }
 
+    /**
+     * 修改用户入职日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserEntryDate(SysUser user)
+    {
+        return userMapper.updateUserEntryDate(user);
+    }
+
     /**
      * 修改用户合同签订日期
      *

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -402,6 +402,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
 
+	<update id="updateUserEntryDate" parameterType="SysUser">
+ 		update sys_user set entry_date = #{entryDate} where user_id = #{userId}
+	</update>
+
 	<update id="updateUserContractSign" parameterType="SysUser">
  		update sys_user set contract_sign = #{contractSign} where user_id = #{userId}
 	</update>

oa-ui-app/pages/form/borrow/borrow.vue

@@ -650,7 +650,7 @@ export default {
         let formData = new FormData();
         let message = "您有一条新的借款申请： \n>" + 
         "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
-        "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" + 
+        "借款金额：<font color='warning'>" + this.form.managerAmount ? this.form.managerAmount : this.form.applyAmount + "</font> 元 \n>" + 
         "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" + 
         "\n>" + 
 		"已办流程：<font color='comment'>" + this.taskName + "</font> \n>";