部门树更新

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

@@ -81,6 +81,9 @@ public class SysUserController extends BaseController
         if (user.getDeptId() != null && user.getDeptId() == 103L) {
             list = postService.selectGmAssistant(user);
         }
+        if (user.getDeptId() != null && user.getDeptId() == 115L) {
+            list.addAll(postService.selectDispatch(user));
+        }
         for (SysUser sysUser : list) {
             StringBuilder postName = new StringBuilder();
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/TreeSelectNew.java

@@ -55,6 +55,9 @@ public class TreeSelectNew implements Serializable
         SysUser gmAssistant = new SysUser();
         gmAssistant.setStatus("0");
         List<SysUser> gmAssistantList = userPostMapper.selectGmAssistant(gmAssistant);
+        SysUser dispatch = new SysUser();
+        dispatch.setStatus("0");
+        List<SysUser> dispatchList = userPostMapper.selectDispatch(dispatch);
         if (dept.getDeptId() == 101L) {
             list.addAll(dsSecretaryList);
         }
@@ -64,6 +67,9 @@ public class TreeSelectNew implements Serializable
         if (dept.getDeptId() == 103L) {
             list = gmAssistantList;
         }
+        if (dept.getDeptId() == 115L) {
+            list.addAll(dispatchList);
+        }
         String count = "(" + (list == null ? 0 : list.size()) + ")";
         this.label = dept.getDeptName() + count;
         this.children = dept.getChildren().stream().map(TreeSelectNew::new).collect(Collectors.toList());

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

@@ -68,6 +68,14 @@ public interface SysUserPostMapper
      */
     public List<SysUser> selectDsSecretary(SysUser user);
 
+    /**
+     * 查询德方派遣员工集合
+     *
+     * @param
+     * @return 德方派遣员工列表
+     */
+    public List<SysUser> selectDispatch(SysUser user);
+
     /**
      * 根据岗位查询用户
      *

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

@@ -124,6 +124,14 @@ public interface ISysPostService
      */
     public List<SysUser> selectDsSecretary(SysUser user);
 
+    /**
+     * 查询德方派遣员工集合
+     *
+     * @param
+     * @return 德方派遣员工列表
+     */
+    public List<SysUser> selectDispatch(SysUser user);
+
     /**
      * 根据岗位查询用户
      *

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

@@ -211,6 +211,17 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDsSecretary(user);
     }
 
+    /**
+     * 查询德方派遣员工集合
+     *
+     * @param
+     * @return 德方派遣员工列表
+     */
+    @Override
+    public List<SysUser> selectDispatch(SysUser user) {
+        return userPostMapper.selectDispatch(user);
+    }
+
     /**
      * 根据岗位查询用户
      *

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

@@ -96,6 +96,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
+	<select id="selectDispatch" parameterType="SysUser" resultMap="SysUserResult">
+		select u.*, d.dept_name
+		from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.remark like '%德方%'
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="degree != null and degree != ''">
+			AND u.degree = #{degree}
+		</if>
+		<if test="titles != null and titles != ''">
+			AND find_in_set(#{titles}, u.titles)
+		</if>
+		<if test="certificates != null and certificates != ''">
+			AND find_in_set(#{certificates}, u.certificates)
+		</if>
+	</select>
+
 	<select id="selectGmAssistant" parameterType="SysUser" resultMap="SysUserResult">
 		select u.*, d.dept_name
 		from sys_user u

oa-ui-app/main.js

@@ -19,7 +19,7 @@ Vue.prototype.$store = store
 // 创建全局的 publicData 对象
 Vue.prototype.publicData = {
   partySecretary: 4, // 党委书记
-  leagueSecretary: 15, // 团委书记
+  leagueSecretary: 15, // 团支部书记
   gm: 7, //总经理
   chairman: 2,//董事长
   zg: 9,

oa-ui/src/views/oa/staff/index.vue

@@ -171,6 +171,8 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="备注" align="center" key="remark" prop="remark" v-if="columns[22].visible"
+            :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
               <el-button size="mini" type="text" icon="el-icon-view" v-hasPermi="['system:user:query']"
@@ -488,6 +490,7 @@ export default {
         { key: 19, label: `初始学历`, visible: false },
         { key: 20, label: `初始学历专业`, visible: false },
         { key: 21, label: `初始学历毕业院校`, visible: false },
+        { key: 22, label: `备注`, visible: false },
       ],
       // 表单校验
       rules: {

oa-ui/src/views/oa/staff/info.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
  * @LastEditors: wrh
- * @LastEditTime: 2025-05-19 16:50:50
+ * @LastEditTime: 2025-11-18 15:52:46
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -89,6 +89,13 @@
           </div>
           <div>{{ form.contact + form.telephone }}</div>
         </div>
+        <div class="info-item">
+          <div class="item-label">
+            <svg-icon icon-class="log" class="info-icon"></svg-icon>
+            <div class="item-label">备注：</div>
+          </div>
+          <div>{{ form.remark }}</div>
+        </div>
       </el-col>
       <el-col :span="15" class="stateInfo">
         <el-tabs v-model="activeName" @tab-click="handleClick">