From c1fd8c9c1879483c3b3d7c17bc2f5b44ea1c7dd3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 2 Jan 2024 08:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=90=8D+bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/system/api/domain/SysUser.java     | 11 +++++++++++
 .../service/impl/SysUserServiceImpl.java      | 12 +++++++++++-
 .../resources/mapper/system/SysUserMapper.xml | 19 +++++++++++++++----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
index 56102a91c..3e84e5dee 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
@@ -100,6 +100,17 @@ public class SysUser extends BaseEntity {
 
 	}
 
+	//新增 微信账号
+	private String wxId;
+
+	public String getWxId() {
+		return wxId;
+	}
+
+	public void setWxId(String wxId) {
+		this.wxId = wxId;
+	}
+
 	public String getUserCode() {
 		return userCode;
 	}
diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java
index d9bcfd2a1..c1e656d28 100644
--- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java
+++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Validator;
 
 import com.op.system.domain.SysDatasource;
@@ -28,6 +29,8 @@ import com.op.system.domain.SysUserPost;
 import com.op.system.domain.SysUserRole;
 import com.op.system.service.ISysConfigService;
 import com.op.system.service.ISysUserService;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
  * 用户 业务层处理
@@ -242,13 +245,17 @@ public class SysUserServiceImpl implements ISysUserService {
 		// 新增用户与角色管理
 		insertUserRole(user);
 		// 加工厂数据权限
+		//工厂号
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		String key = "#header.poolName";
+		user.setDeptId(Long.parseLong(request.getHeader(key.substring(8)).replace("ds_","")));
 		insertUserDB(user);
 		return rows;
 	}
 	public void insertUserDB(SysUser user) {
 		// 新增用户与园区数据源
 		SysDatasource qo = new SysDatasource();
-		qo.setDeptId(user.getDeptId());//
+		qo.setDeptId(user.getDeptId());
 
 		//先删掉
 		sysDatasourceMapper.deletUserDB(user.getUserId().toString());
@@ -293,6 +300,9 @@ public class SysUserServiceImpl implements ISysUserService {
 		// 新增用户与岗位管理
 		insertUserPost(user);
 		// 加工厂数据权限
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		String key = "#header.poolName";
+		user.setDeptId(Long.parseLong(request.getHeader(key.substring(8)).replace("ds_","")));
 		insertUserDB(user);
 		return userMapper.updateUser(user);
 	}
diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2781b88e5..b7c7b6e30 100644
--- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,8 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<result property="wxId"       column="wx_id"/>
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
+
     </resultMap>
 
     <resultMap id="deptResult" type="SysDept">
@@ -47,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.wx_id,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -57,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.wx_id , d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -66,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<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>
@@ -83,12 +88,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE CHARINDEX(CONVERT (VARCHAR, #{deptId}), ancestors) > 0
 			    ))
 		</if>
+		<if test="wxId != null and wxId != ''">
+			AND u.wx_id like concat('%', #{wxId}, '%')
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
 
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time , u.wx_id
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -105,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time , u.wx_id
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -158,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+		    <if test="wxId != null and wxId != ''">wx_id,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -172,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+		    <if test="wxId != null and wxId != ''">#{wxId},</if>
 		GETDATE()
  		)
 	</insert>
@@ -192,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="wxId != null">wx_id = #{wxId},</if>
  			update_time = GETDATE()
  		</set>
  		where user_id = #{userId}