Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-04-18 f2d0713c2b20a6c751399e2468996eafb8812988

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java

@@ -74,6 +74,7 @@
 */
@Service
@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implements IUserService {
   private static final String GUEST_NAME = "guest";

@@ -386,6 +387,7 @@
   }

   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean removeUser(String userIds) {
      if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
         throw new ServiceException("不能删除本账号!");
@@ -410,6 +412,7 @@
         if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
            user.setTenantId(AuthUtil.getTenantId());
         }
         user.setType(userExcel.getType());
         // 覆盖数据
         if (isCovered) {
            // 查询用户是否存在
@@ -421,7 +424,9 @@
            }
         }
         // 获取默认密码配置
         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);

         String initPassword = CommonConstant.DEFAULT_PASSWORD;
         user.setPassword(initPassword);
         this.submit(user);
      });