tj

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysUserController.java

@@ -6,14 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.devplatform.admin.common.annotation.SysLogMethod;
 import com.devplatform.admin.common.utils.AbstractController;
 import com.devplatform.admin.common.utils.Aes;
-import com.devplatform.admin.common.utils.Constants;
 import com.devplatform.admin.modules.sys.bean.SysRoleEntity;
-import com.devplatform.admin.modules.sys.bean.SysSystem;
 import com.devplatform.admin.modules.sys.bean.SysUserEntity;
 import com.devplatform.admin.modules.sys.form.PasswordForm;
 import com.devplatform.admin.modules.sys.model.SysUserModel;
 import com.devplatform.admin.modules.sys.service.SysRoleService;
-import com.devplatform.admin.modules.sys.service.SysSystemService;
 import com.devplatform.admin.modules.sys.service.SysUserRoleService;
 import com.devplatform.admin.modules.sys.service.SysUserService;
 import com.devplatform.common.base.annotation.SysLog;
@@ -44,16 +41,12 @@ import java.util.Map;
 @RestController
 @RequestMapping("/sys/user")
 public class SysUserController extends AbstractController {
-    private static String CREATE_USER_ID = "create_user_id";
-
     @Autowired
     private SysRoleService sysRoleService;
     @Autowired
     private SysUserService sysUserService;
     @Autowired
     private SysUserRoleService sysUserRoleService;
-    @Autowired
-    private SysSystemService sysSystemService;
 
     /**
      * 所有用户列表
@@ -107,7 +100,7 @@ public class SysUserController extends AbstractController {
     public R password(@RequestBody PasswordForm form) {
         Assert.isBlank(form.getNewPassword(), "新密码不为能空");
         // 用户信息
-        SysUserEntity user = sysUserService.queryByUserName(form.getUsername(), form.getStationId());
+        SysUserEntity user = sysUserService.queryByUserName(form.getUsername());
 
         // sha256加密
         String password = new Sha256Hash(form.getPassword(), user.getSalt()).toHex();
@@ -160,9 +153,8 @@ public class SysUserController extends AbstractController {
     @GetMapping("/infoByName/{userName}")
     public SysUserEntity infoByName(@PathVariable("userName") String userName, String stationId) {
         // 获取当前站点信息
-        SysSystem sysSystem = sysSystemService.getById(Constants.CODE);
         String u = Aes.decrypt(userName);
-        SysUserEntity user = sysUserService.queryByUserName(u, sysSystem.getCode());
+        SysUserEntity user = sysUserService.queryByUserName(u);
 
         // 获取用户所属的角色列表
         List<String> roleIdList = sysUserRoleService.queryRoleIdList(user.getUserId());