更改用户信息更改接口

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -160,13 +160,20 @@ public class User extends TenantEntity {
 	 * 仓库名称id
 	 */
 	@ApiModelProperty(value = "仓库名称id")
-	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Long storageId;
 
 	/**
 	 * 仓库名称
 	 */
 	@ApiModelProperty(value = "仓库名称")
-	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String storageName;
+
+	/**
+	 * 仓库是否存在
+	 * 主要用于后台修改仓库
+	 * 1 为未传值则将仓库数据置空
+	 */
+	@TableField(exist = false)
+	private Integer storageExist;
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -44,7 +44,7 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @return
 	 */
 	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList,
-							   @Param("tenantId") String tenantId,@Param("roleId") String roleId);
+							  @Param("tenantId") String tenantId, @Param("roleId") String roleId);
 
 	/**
 	 * 获取用户
@@ -66,10 +66,11 @@ public interface UserMapper extends BaseMapper<User> {
 
 	/**
 	 * 根据租户获取用户信息
+	 *
 	 * @param tenantId
 	 * @return
 	 */
-	List<Map<String,Object>>  gainUser(@Param("tenantId")String tenantId,@Param("deptId")String deptId,@Param("roleName")String roleName);
+	List<Map<String, Object>> gainUser(@Param("tenantId") String tenantId, @Param("deptId") String deptId, @Param("roleName") String roleName);
 
 	/**
 	 * 根据客户ID获取用户ID
@@ -88,8 +89,16 @@ public interface UserMapper extends BaseMapper<User> {
 	List<User> selectUserIds(@Param("users") List<Long> users);
 
 	@TenantIgnore
-	List<User> selectListNotTenantId(@Param("tenantId")String tenantId, @Param("ids")String ids);
+	List<User> selectListNotTenantId(@Param("tenantId") String tenantId, @Param("ids") String ids);
 
 	@TenantIgnore
-    void updateByIdPointsBalance(@Param("users")User users);
+	void updateByIdPointsBalance(@Param("users") User users);
+
+	/**
+	 * 修改用户
+	 *
+	 * @param user 参数
+	 * @return 结果
+	 */
+	int updateUserById(User user);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--suppress ALL -->
 <mapper namespace="org.springblade.system.user.mapper.UserMapper">
 
     <!-- 通用查询映射结果 -->
@@ -27,6 +28,10 @@
         <result column="dept_id" property="deptId"/>
         <result column="post_id" property="postId"/>
         <result column="working_status" property="workingStatus"/>
+        <result column="points_balance" property="pointsBalance"/>
+        <result column="applets_id" property="appletsId"/>
+        <result column="storage_id" property="storageId"/>
+        <result column="storage_name" property="storageName"/>
     </resultMap>
     <update id="updateByIdPointsBalance" parameterType="org.springblade.system.user.entity.User">
         update blade_user
@@ -36,6 +41,42 @@
         </if>
         where id = #{users.id}
     </update>
+    <update id="updateUserById" parameterType="org.springblade.system.user.entity.User">
+        UPDATE blade_user
+        <set>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+            <if test="code != null and code != ''">code = #{code},</if>
+            <if test="userType != null">user_type = #{userType},</if>
+            <if test="account != null and account != ''">account = #{account},</if>
+            <if test="password != null and password != ''">password = #{password},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="realName != null and realName != ''">real_name = #{realName},</if>
+            <if test="email != null and email != ''">email = #{email},</if>
+            <if test="emailAuthorization != null">email_authorization = #{emailAuthorization},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="birthday != null">birthday = #{birthday},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="roleId != null">role_id = #{roleId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="postId != null">post_id = #{postId},</if>
+            <if test="workingStatus != null">working_status = #{workingStatus},</if>
+            <if test="pointsBalance != null">points_balance = #{pointsBalance},</if>
+            <if test="appletsId != null">applets_id = #{appletsId},</if>
+            <if test="storageExist == 1">
+                storage_id = null,
+                storage_name = null
+            </if>
+            <if test="storageExist == null or storageExist != 1">
+                <if test="storageId != null">storage_id = #{storageId},</if>
+                <if test="storageName != null and storageName != ''">storage_name = #{storageName},</if>
+            </if>
+        </set>
+        WHERE id = #{id}
+    </update>
 
     <select id="selectUserPage" resultMap="userResultMap">
         select * from blade_user where is_deleted = 0

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.TenantConstant;
+import org.springblade.common.enums.NumberEnum;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -140,7 +141,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	@Override
 	public boolean updateUserInfo(User user) {
 		user.setPassword(null);
-		return updateById(user);
+		int updateCount = baseMapper.updateUserById(user);
+		// return updateById(user);
+		return updateCount >= NumberEnum.ONE.number;
 	}
 
 	private boolean submitUserDept(User user) {