Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/EkpPermissionTask.java

@@ -29,7 +29,7 @@ public class EkpPermissionTask {
 	 * @Date 2023-9-5 09:45:22
 	 * @Param
 	 **/
-	public void doStatisticsTaxDeclarer() throws Exception {
+	public void doRefreshEkpUser() throws Exception {
 		log.info("-------------刷新EKP权限里的账号信息-定时任务开始------------");
 		HttpDaprUtil.invokeMethodPost(daprEkpPermissionProperties.getAppUrl(), daprEkpPermissionProperties.getAppId(),
 				"/sysuserinfo/inner/doRefreshEkpUser", "", Object.class,

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysRoleMenuRes.java

@@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -36,9 +34,8 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @TableName("sys_role_menu_res")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "新权限-角色-菜单-关联表")
-public class SysRoleMenuRes extends BaseEntity {
+public class SysRoleMenuRes {
 
 	/**
 	 * 主键

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserRoleRes.java

@@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -36,9 +34,8 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @TableName("sys_user_role_res")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "新权限-账号-角色关联表")
-public class SysUserRoleRes extends BaseEntity {
+public class SysUserRoleRes {
 
 	/**
 	 * 主键

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysUserInfoController.java

@@ -114,6 +114,20 @@ public class SysUserInfoController {
 		return R.ok(sysUserInfoService.removeById(fdId));
 	}
 
+	/**
+	 * @Description: 手动同步并更新账号信息
+	 * @Author: hgw
+	 * @Date: 2023/9/5 16:14
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Operation(summary = "手动同步并更新账号信息", description = "手动同步并更新账号信息")
+	@SysLog("手动同步并更新账号信息")
+	@PostMapping("/startRefreshEkpUser")
+	public R<String> startRefreshEkpUser() {
+		sysUserInfoService.doRefreshEkpUser();
+		return R.ok();
+	}
+
 	/**
 	 * @param
 	 * @Description: 定时任务-自动同步并更新账号信息

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysRoleInfoServiceImpl.java

@@ -111,6 +111,9 @@ public class SysRoleInfoServiceImpl extends ServiceImpl<SysRoleInfoMapper, SysRo
 				return R.failed("名称已存在");
 			}
 			this.saveOrUpdate(role);
+			for (SysRoleMenuRes res : resList) {
+				res.setRoleId(role.getFdId());
+			}
 			sysRoleMenuResService.saveBatch(resList);
 			return R.ok("保存成功");
 		}

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysRoleMenuResServiceImpl.java

@@ -15,7 +15,6 @@ package com.yifu.cloud.plus.v1.permission.service.impl;/*
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -24,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.permission.mapper.SysRoleMenuResMapper;
 import com.yifu.cloud.plus.v1.permission.service.SysRoleMenuResService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysRoleMenuRes;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysRoleMenuResSearchVo;
 import lombok.extern.log4j.Log4j2;
@@ -62,7 +60,6 @@ public class SysRoleMenuResServiceImpl extends ServiceImpl<SysRoleMenuResMapper,
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
 		}
-		wrapper.orderByDesc(BaseEntity::getCreateTime);
 		return baseMapper.selectList(wrapper);
 	}
 
@@ -80,14 +77,6 @@ public class SysRoleMenuResServiceImpl extends ServiceImpl<SysRoleMenuResMapper,
 
 	private LambdaQueryWrapper buildQueryWrapper(SysRoleMenuResSearchVo entity) {
 		LambdaQueryWrapper<SysRoleMenuRes> wrapper = Wrappers.lambdaQuery();
-		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-			wrapper.ge(SysRoleMenuRes::getCreateTime, entity.getCreateTimes()[0])
-					.le(SysRoleMenuRes::getCreateTime,
-							entity.getCreateTimes()[1]);
-		}
-		if (Common.isNotNull(entity.getCreateName())) {
-			wrapper.eq(SysRoleMenuRes::getCreateName, entity.getCreateName());
-		}
 		return wrapper;
 	}
 

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserInfoServiceImpl.java

@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.permission.service.SysUserRoleResService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.permission.entity.SysRoleMenuRes;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserInfo;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserRoleRes;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserInfoSaveVo;
@@ -148,6 +149,9 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
 				sysUserRoleResService.deleteByUserId(user.getFdId());
 			}
 			this.saveOrUpdate(user);
+			for (SysUserRoleRes res : resList) {
+				res.setUserId(user.getFdId());
+			}
 			sysUserRoleResService.saveBatch(resList);
 			return R.ok("保存成功");
 		}

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserRoleResServiceImpl.java

@@ -15,7 +15,6 @@ package com.yifu.cloud.plus.v1.permission.service.impl;/*
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -24,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.permission.mapper.SysUserRoleResMapper;
 import com.yifu.cloud.plus.v1.permission.service.SysUserRoleResService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserRoleRes;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserRoleResSearchVo;
 import lombok.extern.log4j.Log4j2;
@@ -62,7 +60,6 @@ public class SysUserRoleResServiceImpl extends ServiceImpl<SysUserRoleResMapper,
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
 		}
-		wrapper.orderByDesc(BaseEntity::getCreateTime);
 		return baseMapper.selectList(wrapper);
 	}
 
@@ -78,14 +75,6 @@ public class SysUserRoleResServiceImpl extends ServiceImpl<SysUserRoleResMapper,
 
 	private LambdaQueryWrapper buildQueryWrapper(SysUserRoleResSearchVo entity) {
 		LambdaQueryWrapper<SysUserRoleRes> wrapper = Wrappers.lambdaQuery();
-		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-			wrapper.ge(SysUserRoleRes::getCreateTime, entity.getCreateTimes()[0])
-					.le(SysUserRoleRes::getCreateTime,
-							entity.getCreateTimes()[1]);
-		}
-		if (Common.isNotNull(entity.getCreateName())) {
-			wrapper.eq(SysUserRoleRes::getCreateName, entity.getCreateName());
-		}
 		return wrapper;
 	}
 

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserInfoMapper.xml

@@ -123,6 +123,7 @@
 			 ,SUBSTRING_INDEX(SUBSTRING_INDEX(e.fd_ldap_dn,',ou', 2),',ou=', -1) AS fd_dept_name
 			 ,p.fd_mobile_no,p.fd_email
 		from sys_org_element e JOIN sys_org_person p on e.fd_id=p.fd_id
+		where e.fd_is_available = '1'
     </select>
 
 </mapper>