Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -14,9 +14,11 @@ import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.entity.BaseUser;
 import com.ozs.framework.web.service.TokenService;
 //import com.ozs.service.entity.BaseUser;
 //import com.ozs.service.service.BaseUserService;
+import com.ozs.service.BaseUserService;
 import com.ozs.system.service.*;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -69,8 +71,8 @@ public class SysUserController extends BaseController {
     private DataScoreUtil dataScoreUtil;
     @Autowired
     private ISysDictTypeService dictTypeService;
-//    @Resource
-//    private BaseUserService baseUserService;
+    @Resource
+    private BaseUserService baseUserService;
 //    /**
 //     * 获取用户列表
 //     */
@@ -244,10 +246,10 @@ public class SysUserController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
 //        userService.checkUserDataScope(user.getId());
-//        BaseUser baseUser = baseUserService.getUserById(user.getId());
-//        if (baseUser.getUserName().equals("admin")){
-//            return success("admin账号不能修改");
-//        }
+        BaseUser baseUser = baseUserService.getUserById(user.getId());
+        if (baseUser.getUserName().equals("admin")) {
+            return success("admin账号不能修改");
+        }
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNum())