11

ruoyi-admin/src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: false
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: D:/ruoyi/uploadPath
+    profile: /home/ruoyi/OA_kaoqin/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -96,6 +96,8 @@ public class SysUser extends BaseEntity
      */
     private String code;
 
+    private String parameter;
+
     public String getCode() {
         return code;
     }
@@ -320,6 +322,14 @@ public class SysUser extends BaseEntity
         this.applyFor = applyFor;
     }
 
+    public String getParameter() {
+        return parameter;
+    }
+
+    public void setParameter(String parameter) {
+        this.parameter = parameter;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInfo.java

@@ -58,6 +58,9 @@ public class RecordInfo extends BaseEntity
     @Excel(name = "消息类型 1：转换部门通知")
     private String infoType;
 
+    private Long userId;
+
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -164,6 +167,14 @@ public class RecordInfo extends BaseEntity
         this.topDept = topDept;
     }
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -691,7 +691,7 @@ public class SysUserServiceImpl implements ISysUserService
         if (applyForUser!=null){
             return AjaxResult.success("操作成功",applyForUser);
         }
-        return AjaxResult.success("该人员不存在或该人员已分配部门");
+        return AjaxResult.success("该用户尚未注册或已同意邀请");
     }
 
     @Override

ruoyi-system/src/main/resources/mapper/system/RecordInfoMapper.xml

@@ -42,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isRead != null  and isRead != ''"> and is_read = #{isRead}</if>
             <if test="infoType != null  and infoType != ''"> and info_type = #{infoType}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="userId != null  and userId != ''"> and (sender_id = #{userId} or addressee_id = #{userId}) </if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectRecordInfoById" parameterType="Long" resultMap="RecordInfoResult">

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

@@ -87,6 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
+		<if test="parameter != null and parameter != ''">
+			AND (u.phonenumber like concat('%', #{parameter}, '%') or u.nick_name like concat('%', #{parameter}, '%'))
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>