bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -182,11 +182,11 @@ public class UserController {
     @PostMapping("/submit2")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增2", notes = "传入UserDTO")
-  //  @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+    //  @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
     public R submitTow(@Valid @RequestBody UserDTO user) {
         CacheUtil.clear(USER_CACHE);
         // 为第三方系统
-        if(user.getSysId().equals("30")){
+        if (ObjectUtil.isNotEmpty(user.getSysId()) && user.getSysId().equals("30")) {
             user.setUserType("1,2,3");
             user.setPassword("123456");
             user.setPlaintextPassword("123456");
@@ -195,7 +195,7 @@ public class UserController {
             user.setStatus(1);
             user.setSysType(2);
             List<SaveUserInfoByProjectDTO> projectAndUserList = new ArrayList<>();
-            SaveUserInfoByProjectDTO data= new SaveUserInfoByProjectDTO();
+            SaveUserInfoByProjectDTO data = new SaveUserInfoByProjectDTO();
             data.setContractId("1714919227250950146");
             data.setProjectId("1612329251049537537");
             data.setRoleId("1537248158277914626");
@@ -452,9 +452,9 @@ public class UserController {
     @PostMapping("/loginByToken")
     @ApiOperationSupport(order = 20)
     @ApiOperation(value = "token验证加密", notes = "token验证登录")
-    public R loginByToken(String  token) {
-      //  this.loginByToken2(token);
-        token = "bearer "+token;
+    public R loginByToken(String token) {
+        //  this.loginByToken2(token);
+        token = "bearer " + token;
         HttpClient httpClient = HttpClientBuilder.create().build();
         HttpGet httpPost = new HttpGet("http://47.110.251.215:8090/blade-auth/oauth/user-info");
         httpPost.setHeader("Authorization", token); //这个需要 client:
@@ -470,11 +470,11 @@ public class UserController {
                 outputStream.write(buffer, 0, index);
             }
             JSONObject jsonObject = JSON.parseObject(outputStream.toString());
-            if(jsonObject!=null && ObjectUtil.isNotEmpty(jsonObject)){
+            if (jsonObject != null && ObjectUtil.isNotEmpty(jsonObject)) {
                 JSONObject data = jsonObject.getJSONObject("data");
                 String name = data.getString("name");
                 return this.loginByToken2(name);
-            }else{
+            } else {
                 return R.fail("token解析用户失败");
             }
         } catch (IOException e) {
@@ -501,10 +501,10 @@ public class UserController {
             if (userInfo == null) {
                 return R.fail("用户名或密码错误");
             }
-            String tenId =userInfo.getTenantId();
+            String tenId = userInfo.getTenantId();
             String pass = userInfo.getPlaintextPassword();
-            String md5Pass =MD5Utils.md5Hex(pass,"UTF-8");
-            System.out.println("密码"+ md5Pass);
+            String md5Pass = MD5Utils.md5Hex(pass, "UTF-8");
+            System.out.println("密码" + md5Pass);
 
             HttpClient httpClient = HttpClientBuilder.create().build();
             HttpPost httpPost = new HttpPost("http://47.110.251.215:8090/blade-auth/oauth/token");

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -94,8 +94,8 @@ public class WbsTreeController extends BladeController {
      * @date 2024年1月6日10:28:01
      */
     @PostMapping("/informationWriteQuery/page")
-    @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "分页")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "资料查询分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "size", value = "当前页条数", required = true),
             @ApiImplicitParam(name = "current", value = "当前页", required = true),

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -1322,7 +1322,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         }
         long endTime = System.currentTimeMillis();
         long executionTime = endTime - startTime;
-        _logger.info("合同段 " + node.getContractId() + " 获取当前资料缓存 执行时间：" + executionTime + " ms");
+        _logger.info("合同段 " + node.getContractId() + " 获取当前资料 执行时间：" + executionTime + " ms");
 
         if (result.size() != 0) {
             Map<String, List<Task>> taskMaps = new HashMap<>();