合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!103

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java

@@ -151,4 +151,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
 
 	List<SysUser> getPPEmployeeList(@Param("thirdType") String thirdType);
+
+	void updateByIdPP (SysUser sysUser);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -200,4 +200,26 @@
 		select * from sys_user where third_type = #{thirdType}
 	</select>
 
+	<update id="updateByIdPP">
+		UPDATE
+			sys_user
+		SET
+			username = #{username},
+			realname = #{realname},
+			status = #{status},
+		    del_flag = #{delFlag},
+			third_id = #{thirdId},
+			work_no = #{workNo},
+			worker_type = #{workerType},
+		    create_time = #{createTime},
+			update_time = #{updateTime},
+			job_code = #{jobCode},
+			job_title = #{jobTitle},
+			org_code = #{orgCode},
+			email = #{email},
+			telephone = #{telephone}
+		WHERE
+			id = #{id}
+	</update>
+
 </mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -562,7 +562,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			}
 		}
 
-		updateById(sysUser);
+		this.baseMapper.updateByIdPP(sysUser);
 
 	}