diff --git a/lis-system/src/main/java/com/czlis/system/web/controller/system/SysUserController.java b/lis-system/src/main/java/com/czlis/system/web/controller/system/SysUserController.java index 0b3c4e8..c8b5f0b 100644 --- a/lis-system/src/main/java/com/czlis/system/web/controller/system/SysUserController.java +++ b/lis-system/src/main/java/com/czlis/system/web/controller/system/SysUserController.java @@ -17,6 +17,8 @@ import com.czlis.system.service.ISysDeptService; import com.czlis.system.service.ISysPostService; import com.czlis.system.service.ISysRoleService; import com.czlis.system.service.ISysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -34,6 +36,7 @@ import java.util.stream.Collectors; * @author admin */ @RestController +@Api(tags = "用户信息") @RequestMapping("/system/user") public class SysUserController extends BaseController { @Autowired @@ -228,6 +231,7 @@ public class SysUserController extends BaseController { * 同步用户数据 * @return */ + @ApiOperation("同步用户数据") @GetMapping("/syncUser") public Result syncUser(){ return userService.syncUser(); diff --git a/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java b/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java index 9e47194..a55297e 100644 --- a/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java +++ b/lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java @@ -239,13 +239,20 @@ public class SysLoginService { * @return 结果 */ public String loginAnonymous(String username, String password, String code, String uuid) { + if(username == null || username.equals("")) throw new UserNotExistsException(); LoginUser loginUser = new LoginUser(); int random = new Random().nextInt(1000); loginUser.setUserId((long) (random+8000)); //先用随机数代替 SysUser sysUser = userMapper.selectUserByUserName(username); if (sysUser == null) { sysUser = new SysUser(); - sysUser.setUserId(Long.parseLong(username)); + long userId = 0L; + try{ + userId = Long.parseLong(username); + }catch (Exception e){ + userId = random; + } + sysUser.setUserId(userId); sysUser.setUserName(username); String loginUserName = commonUtil.getComDictNameById("SRD", username); sysUser.setNickName(loginUserName);