Merge remote-tracking branch 'origin/MVP1.6.3' into develop

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -501,7 +501,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			List<PersonVo> list = ldapUtil.getAllPersons();
 			if (null != list) {
 				List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda()
-						.eq(SysUser::getType, CommonConstants.STATUS_NORMAL)
+						.eq(SysUser::getType, CommonConstants.ZERO_STRING)
+						.eq(SysUser::getSystemFlag, CommonConstants.ONE_STRING)
 						.eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL));
 				List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList());
 				//筛选出不存在的用户重置为不可用
@@ -509,10 +510,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				List<String> collect = list1.stream().filter(s -> !list2.contains(s)
 				).collect(Collectors.toList());
 				log.info("要重置为不可用的用户列表：" + collect);
-				LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>();
-				settleUpdate.set(SysUser::getDelFlag,CommonConstants.ONE_STRING);
-				settleUpdate.in(SysUser::getUsername,collect);
-				this.update(settleUpdate);
+				if (!collect.isEmpty()) {
+					LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>();
+					settleUpdate.in(SysUser::getUsername, collect)
+							.set(SysUser::getDelFlag, CommonConstants.ONE_STRING);
+					this.update(settleUpdate);
+				}
 
 				List<PersonVo> updateList = new ArrayList<>();
 				List<PersonVo> insertList = new ArrayList<>();
@@ -750,7 +753,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			return R.failed("传参不能为空");
 		}
 		boolean isAll = (boolean) json.get("isAll");
-		String dataType = json.get("isAll").toString();
+		String dataType = json.get("dataType").toString();
 		//获取人员和部门信息
 		JSONArray updateParamsArr=json.getJSONArray("data");
 		if (Common.isEmpty(updateParamsArr)) {
@@ -775,7 +778,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	 * @return
 	 */
 	private void updateOrSaveUser(JSONArray updateParamsArr) {
-		List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL));
+		List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda()
+				.eq(SysUser::getType, CommonConstants.STATUS_NORMAL)
+				.eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL));
 		List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList());
 		List<PersonVo> updateList = new ArrayList<>();
 		List<PersonVo> insertList = new ArrayList<>();

yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -270,14 +270,14 @@
 			<trim prefix="dept_id =case" suffix="end,">
 				<foreach collection="list" item="i" index="index">
 					<if test="i.deptId!=null">
-						when username=#{i.userId} then #{i.deptId}
+						when username=#{i.uid} then #{i.deptId}
 					</if>
 				</foreach>
 			</trim>
 			<trim prefix="dept_name =case" suffix="end,">
 				<foreach collection="list" item="i" index="index">
 					<if test="i.deptName!=null">
-						when username=#{i.userId} then #{i.deptName}
+						when username=#{i.uid} then #{i.deptName}
 					</if>
 				</foreach>
 			</trim>