update

yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java

@@ -113,6 +113,29 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    /**
+     * 用于修改
+     */
+    private Long oldComId;
+
+    public Long getOldComId() {
+        return oldComId;
+    }
+
+    public void setOldComId(Long oldComId) {
+        this.oldComId = oldComId;
+    }
+
+    private Long isActive;
+
+    public Long getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Long isActive) {
+        this.isActive = isActive;
+    }
+
     public SysUser()
     {
 

yanzhu-auth/src/main/resources/bootstrap.yml

@@ -16,10 +16,12 @@ spring:
         # 服务注册地址
         server-addr: @discovery.server-addr@
         # 服务分组
-        group: lijun
+        # group: lijun
       config:
         # 配置中心地址
         server-addr: @discovery.server-addr@
+        # 工作空间配置
+        namespace: a113aa27-4d61-46e0-81d6-9cede0457f0d
         # 配置文件格式
         file-extension: yml
         # 共享配置

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java

@@ -79,6 +79,8 @@ public interface SysUserMapper
      */
     public SysUser selectUserByUserId(Long userId);
 
+    public SysUser selectUserCom(SysUser user);
+    public List<SysUser> selectUserComs(Long userId);
     /**
      * 新增用户信息
      * 
@@ -87,6 +89,8 @@ public interface SysUserMapper
      */
     public int insertUser(SysUser user);
 
+    public int insertUserCom(SysUser user);
+
     /**
      * 修改用户信息
      * 
@@ -95,6 +99,7 @@ public interface SysUserMapper
      */
     public int updateUser(SysUser user);
 
+    public int updateUserCom(SysUser user);
     /**
      * 修改用户头像
      * 
@@ -121,6 +126,7 @@ public interface SysUserMapper
      */
     public int deleteUserById(Long userId);
 
+    public int deleteUserCom(Long userId);
     /**
      * 批量删除用户信息
      * 

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml

@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and pi.is_del !=2 
         </where>
         <if test="currentUserId == null "> order by pi.project_sort, pi.id desc</if>
-        <if test="currentUserId != null "> order by pu.sort_by, pi.id desc</if>
+        <if test="currentUserId != null "> order by psu.sort_by, pi.id desc</if>
     </select>
 
     <select id="selectProProjectInfoById" parameterType="Long" resultMap="ProProjectInfoResult">
@@ -384,7 +384,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and pi.is_del!= 2
         </where>
         <if test="currentUserId == null "> order by pi.project_sort, pi.id desc</if>
-        <if test="currentUserId != null "> order by pu.sort_by, pi.id desc</if>
+        <if test="currentUserId != null "> order by psu.sort_by, pi.id desc</if>
     </select>
 
 </mapper>

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml

@@ -340,7 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="editDefaultProjectById">
-        update pro_project_info_subdepts_group set sort_by = project_id where user_id = #{userId}
+        update pro_project_info_subdepts_users set sort_by = project_id where user_id = #{userId}
     </update>
 
 </mapper>

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userType"        column="user_type"        />
         <result property="cardCode"        column="card_code"        />
         <result property="email"        column="email"        />
+		<result property="isActive"        column="is_active"        />
         <result property="phonenumber"  column="phonenumber"  />
         <result property="sex"          column="sex"          />
         <result property="avatar"       column="avatar"       />
@@ -60,10 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.com_id, com.dept_name as com_name, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_code, 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, uc.com_id, com.dept_name as com_name, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_code, u.email
+               , u.avatar, u.phonenumber, u.password, u.sex, uc.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.dept_short_name, d.dept_code, d.dept_type, 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,com.dept_name com_dept_name
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,com.dept_name com_dept_name,uc.is_active is_active
         from sys_user u
+			left jon sys_user_com uc on u.user_id=uc.user_id
 		    left join sys_dept d on u.dept_id = d.dept_id
 			left join sys_dept com on u.com_id = com.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
@@ -71,7 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.com_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, uc.com_id, u.dept_id, u.nick_name, u.user_name,  u.email, u.avatar, u.phonenumber, u.sex, uc.status,
+		       u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
+		       uc.is_active is_active
+		from sys_user u
+		left jon sys_user_com uc on u.user_id=uc.user_id
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -87,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.nick_name = #{nickName}
 		</if>
 		<if test="status != null and status != ''">
-			AND u.status = #{status}
+			AND uc.status = #{status}
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
@@ -106,8 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, uc.com_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, uc.status, u.create_time,uc.is_active is_active
 	    from sys_user u
+		left jon sys_user_com uc on u.user_id=uc.user_id
 			 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
 			 left join sys_role r on r.role_id = ur.role_id
@@ -123,8 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, uc.com_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, uc.status, u.create_time,uc.is_active is_active
 	    from sys_user u
+		left jon sys_user_com uc on u.user_id=uc.user_id
 			 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
 			 left join sys_role r on r.role_id = ur.role_id
@@ -239,7 +248,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<update id="updateUserStatus" parameterType="SysUser">
- 		update sys_user set status = #{status} where user_id = #{userId}
+ 		update sys_user_com set status = #{status} where user_id = #{userId} and com_id=#{comId}
+	</update>
+	<update id="updateUserComActive" parameterType="SysUser">
+		update sys_user_com set is_active = #{isActive} where user_id = #{userId} and com_id=#{comId}
 	</update>
 	
 	<update id="updateUserAvatar" parameterType="SysUser">
@@ -269,4 +281,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where pu.user_id=#{userId} and pu.approve_status <![CDATA[ >= ]]> 100 and pu.is_del=0 and pu.use_status=0 order by pu.sort_by asc
 	</select>
 
+	<insert id="insertUserCom" parameterType="SysUser"  >
+		insert into sys_user(
+		<if test="userId != null and userId != 0">user_id,</if>
+		<if test="comId != null and comId != 0">com_id,</if>
+		<if test="status != null and status != 0">status,</if>
+		<if test="isActive != null and isActive != 0">is_active,</if>
+
+		)values(
+		<if test="userId != null and userId != 0">#{userId},</if>
+		<if test="comId != null and comId != 0">#{comId},</if>
+		<if test="status != null and status != 0">#{status},</if>
+		<if test="isActive != null and isActive != ''">#{isActive},</if>
+		)
+	</insert>
+	<delete id="deleteUserCom" parameterType="SysUser">
+		delete from sys_user_com where user_id=#{userId} and com_id=#{comId}
+	</delete>
+
+	<select id="selectUserCom" parameterType="SysUser"  resultMap="SysUserResult">
+	select user_id,com_id,status,is_active from sys_user_com where  user_id=#{userId} and com_id=#{comId}
+	</select>
+	<update id="updateUserCom" parameterType="SysUser">
+		update sys_user_com set com_id=#{comId} where user_id=#{userId}
+	</update>
+	<select id="selectUserComs" parameterType="Long" resultMap="SysUserResult">
+		select user_id,com_id,status, is_active from sys_user_com where  user_id=#{userId}
+	</select>
 </mapper> 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -844,7 +844,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
     public int editDefaultProjectById(Long id){
         int res = proProjectInfoSubdeptsUsersMapper.editDefaultProjectById(SecurityUtils.getUserId());
         if(res>0){
-            ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
+            ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersByParamId(id,SecurityUtils.getUserId());
             proProjectInfoSubdeptsUsers.setSortBy(0L);
             res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
         }

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java

@@ -368,10 +368,20 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public Long registerUser(SysUser user)
+    public Long registerUser(SysUser user) throws ServiceException
     {
         SysUser sysUser = userMapper.checkUserNameUnique(user.getUserName());
         if(Objects.nonNull(sysUser)){
+            if(user.getComId().equals(sysUser.getOldComId())){
+                SysUser where=new SysUser();
+                where.setUserId(sysUser.getUserId());
+                where.setComId(sysUser.getOldComId());
+                SysUser oldUserCom=userMapper.selectUserCom(where);
+                if(Objects.nonNull(oldUserCom)){
+                    throw new ServiceException("此用户己在此项目中！");
+                }
+                userMapper.updateUserCom(sysUser);
+            }
             user.setUserId(sysUser.getUserId());
             sysUser.setUserName(user.getUserName());
             sysUser.setPhonenumber(user.getUserName());
@@ -385,6 +395,13 @@ public class SysUserServiceImpl implements ISysUserService
             user.setCreateTime(user.getUpdateTime());
             user.setUserType("99");
             userMapper.insertUser(user);
+            List<SysUser> userComs=userMapper.selectUserComs(user.getUserId());
+            if(userComs.size()==0){
+                user.setIsActive(1l);
+            }else{
+                user.setIsActive(0l);
+            }
+            userMapper.insertUserCom(user);
         }
         Long userId = user.getUserId();
         if(Objects.nonNull(user.getUserType()) && Objects.nonNull(user.getActiveProjectId())){
@@ -520,6 +537,16 @@ public class SysUserServiceImpl implements ISysUserService
             throw new ServiceException("所属单位选择异常，必须选择子公司及下属单位");
         }
         user.setComId(dept.getComId());
+        if(user.getComId().equals(user.getOldComId())){
+            SysUser where=new SysUser();
+            where.setUserId(user.getUserId());
+            where.setComId(user.getOldComId());
+            SysUser oldUserCom=userMapper.selectUserCom(where);
+            if(Objects.nonNull(oldUserCom)){
+                throw new ServiceException("此用户己在此项目中！");
+            }
+            userMapper.updateUserCom(user);
+        }
         try {
             if(Objects.equals(user.getUserType(),"99")){
                 // 根据单位递归查询项目信息

yanzhu-ui-vue3/vite.config.js

@@ -44,7 +44,7 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },
         '/statics': {
-          target: `http://localhost:9300`,
+          target: VITE_APP_ENV === 'production'?'http://62.234.3.186':`http://localhost:9300`,
           //target: 'http://62.234.3.186',
           changeOrigin: true,
           pathRewrite: {