明细接口改造

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

@@ -750,7 +750,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 +775,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>