人员列表更新

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

@@ -71,6 +71,31 @@ public class SysUserController extends BaseController
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
+        // 如果指定了部门ID，根据备注中的部门信息添加用户
+        if (user.getDeptId() != null) {
+            SysDept dept = deptService.selectDeptById(user.getDeptId());
+            if (dept != null) {
+                // 查询所有用户
+                SysUser allUser = user;
+                allUser.setDeptId(null);
+                List<SysUser> allUsers = userService.selectUserList(allUser);
+                for (SysUser sysUser : allUsers) {
+                    // 检查用户备注中的部门信息
+                    if (sysUser.getRemark() != null) {
+                        String remark = sysUser.getRemark();
+                        // 提取备注中的部门信息
+                        if (remark.contains("隶属部门：" + dept.getDeptName()) || 
+                            remark.contains("合同部门：" + dept.getDeptName()) || 
+                            remark.contains("工作部门：" + dept.getDeptName())) {
+                            // 确保用户不重复添加
+                            if (!containsUser(list, sysUser)) {
+                                list.add(sysUser);
+                            }
+                        }
+                    }
+                }
+            }
+        }
         if (user.getDeptId() != null && user.getDeptId() == 101L) {
             list.addAll(postService.selectDsSecretary(user));
         }
@@ -80,9 +105,6 @@ 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());
@@ -514,4 +536,19 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeListNew(dept));
     }
+
+    /**
+     * 检查列表中是否包含指定用户
+     */
+    private boolean containsUser(List<SysUser> userList, SysUser user) {
+        if (userList == null || user == null || user.getUserId() == null) {
+            return false;
+        }
+        for (SysUser existingUser : userList) {
+            if (existingUser.getUserId() != null && existingUser.getUserId().equals(user.getUserId())) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -84,10 +84,10 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-    //    milvusClient = new MilvusClientV2(
-    //            ConnectConfig.builder()
-    //                    .uri(milvusServiceUrl)
-    //                    .build());
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
     }
     
     @PostConstruct
@@ -158,6 +158,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
                     fastjsonObj.put("file_name", file.getOriginalFilename());
                     String[] fileName = file.getOriginalFilename().split("\\.");
                     fastjsonObj.put("file_type", fileName[fileName.length - 1]);
+                    fastjsonObj.put("title", text.split("\n")[0]);
                     fastjsonObj.put("content", text);
                     fastjsonObj.put("embedding", embeddingModel.embed(text).content().vectorAsList());
                     String jsonString = fastjsonObj.toJSONString();
@@ -171,6 +172,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
                     JSONObject titlesJsonObj = new JSONObject();
                     titlesJsonObj.put("file_name", file.getOriginalFilename());
                     titlesJsonObj.put("file_type", "标题");
+                    titlesJsonObj.put("title", "");
                     titlesJsonObj.put("content", titlesContent);
                     titlesJsonObj.put("embedding", embeddingModel.embed(titlesContent).content().vectorAsList());
                     String titlesJsonString = titlesJsonObj.toJSONString();

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -35,10 +35,10 @@ public class MilvusServiceImpl implements IMilvusService {
         if (milvusServiceUrl == null || milvusServiceUrl.isEmpty()) {
             throw new IllegalArgumentException("milvusServiceUrl 配置不能为空");
         }
-    //    milvusClient = new MilvusClientV2(
-    //            ConnectConfig.builder()
-    //                    .uri(milvusServiceUrl)
-    //                    .build());
+//        milvusClient = new MilvusClientV2(
+//                ConnectConfig.builder()
+//                        .uri(milvusServiceUrl)
+//                        .build());
     }
     
     @PreDestroy
@@ -81,6 +81,12 @@ public class MilvusServiceImpl implements IMilvusService {
                 .maxLength(10)
                 .build());
 
+        schema.addField(AddFieldReq.builder()
+                .fieldName("title")
+                .dataType(DataType.VarChar)
+                .maxLength(256)
+                .build());
+
         schema.addField(AddFieldReq.builder()
                 .fieldName("content")
                 .dataType(DataType.VarChar)

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.service.ISysDeptService;
 
 import java.io.Serializable;
 import java.util.List;
@@ -42,7 +43,25 @@ public class TreeSelectNew implements Serializable
         SysUser sysUser = new SysUser();
         sysUser.setDeptId(dept.getDeptId());
         SysUserMapper userMapper = SpringUtils.getBean(SysUserMapper.class);
+        // 查询所有用户
         List<SysUser> list = userMapper.selectUserServingList(sysUser);
+        List<SysUser> allUsers = userMapper.selectUserServingList(new SysUser());
+        // 筛选出属于当前部门的用户
+        for (SysUser user : allUsers) {
+            // 检查用户备注中的部门信息
+            if (user.getRemark() != null) {
+                String remark = user.getRemark();
+                // 提取备注中的部门信息
+                if (remark.contains("隶属部门：" + dept.getDeptName()) || 
+                    remark.contains("合同部门：" + dept.getDeptName()) || 
+                    remark.contains("工作部门：" + dept.getDeptName())) {
+                    // 确保用户不重复添加
+                    if (!containsUser(list, user)) {
+                        list.add(user);
+                    }
+                }
+            }
+        }
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
         SysUser dsSecretary = new SysUser();
         dsSecretary.setStatus("0");
@@ -53,11 +72,6 @@ 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);
-        dispatch.setStatus("3");
-        dispatchList.addAll(userPostMapper.selectDispatch(dispatch));
         if (dept.getDeptId() == 101L) {
             list.addAll(dsSecretaryList);
         }
@@ -67,14 +81,26 @@ 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());
     }
 
+    /**
+     * 检查列表中是否包含指定用户
+     */
+    private boolean containsUser(List<SysUser> userList, SysUser user) {
+        if (userList == null || user == null || user.getUserId() == null) {
+            return false;
+        }
+        for (SysUser existingUser : userList) {
+            if (existingUser.getUserId() != null && existingUser.getUserId().equals(user.getUserId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public TreeSelectNew(SysMenu menu)
     {
         this.id = menu.getMenuId();

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

@@ -68,14 +68,6 @@ 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,14 +124,6 @@ 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,17 +211,6 @@ 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,37 +96,6 @@ 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/src/views/flowable/form/finance/borrowForm.vue

@@ -856,7 +856,7 @@ export default {
               }
               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>";
@@ -888,7 +888,7 @@ export default {
               }
               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>";