Merge remote-tracking branch 'origin/lei_dev' into leng_dev

pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/handler/PigAuthenticationSuccessEventHandler.java

@@ -34,6 +34,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServletServerHttpResponse;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
 import org.springframework.security.oauth2.core.OAuth2RefreshToken;
@@ -102,7 +103,11 @@ public class PigAuthenticationSuccessEventHandler implements AuthenticationSucce
 	private void sendSuccessEventLog(HttpServletRequest request,
 			OAuth2AccessTokenAuthenticationToken accessTokenAuthentication, Map<String, Object> map) {
 		// 发送异步日志事件
-		SecurityContextHolder.getContext().setAuthentication(accessTokenAuthentication);
+
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(accessTokenAuthentication);
+		SecurityContextHolder.setContext(context);
+
 		SysLogDTO logVo = SysLogUtils.getSysLog();
 		logVo.setTitle("登录成功");
 		logVo.setLogType(LogTypeEnum.NORMAL.getType());

pigx-common/pigx-common-bom/pom.xml

@@ -18,7 +18,7 @@
 
     <properties>
         <pigx.version>4.6.0</pigx.version>
-        <mybatis-plus.version>3.5.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <dynamic-ds.version>3.5.2</dynamic-ds.version>
         <druid.version>1.2.9</druid.version>
         <hutool.version>5.8.10</hutool.version>

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java

@@ -136,8 +136,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
 			SysTenantMenu tenantMenu = sysTenantMenuService.getById(sysTenant.getMenuId());
 			String[] split = tenantMenu.getMenuIds().split(",");
-			List<SysMenu> newMenuList = menuService
-					.list(Wrappers.<SysMenu>lambdaQuery().in(SysMenu::getMenuId,split));
+			List<SysMenu> newMenuList = menuService.list(Wrappers.<SysMenu>lambdaQuery().in(SysMenu::getMenuId, split));
 			menuList.addAll(newMenuList);
 		});
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java

@@ -413,11 +413,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			}
 			// 删除手机号中的 +86 前缀
 			String phone = item.getPhone().split("-")[1];
+
 			boolean exsitPhone = userList.stream().anyMatch(sysUser -> phone.equals(sysUser.getPhone()));
 			if (exsitPhone) {
 				errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, item.getPhone()));
 			}
-			String deptName = item.getDeptName().split(",")[0];
+			// 根据规则获取部门信息
+			String[] deptNameList = item.getDeptName().split(",")[0].split("-");
+			String deptName = deptNameList[deptNameList.length - 1];
 			// 判断输入的部门名称列表是否合法
 			Optional<SysDept> deptOptional = deptList.stream().filter(dept -> deptName.equals(dept.getName()))
 					.findFirst();

pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm

@@ -52,6 +52,9 @@ public class ${className} extends Model<${className}> {
      */
 #if($column.columnName == $pk.columnName)
     @TableId(type = IdType.ASSIGN_ID)
+#end
+#if($column.columnName == 'del_flag')
+    @TableLogic
 #end
     @ApiModelProperty(value="$column.comments"#if($column.hidden),hidden=$column.hidden#end)
     private $column.attrType $column.lowerAttrName;