ct преди 2 седмици
родител
ревизия
3f440f87ef

+ 26 - 4
fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -1,14 +1,18 @@
 package com.fs.user;
 
+import com.fs.common.annotation.Log;
 import com.fs.common.constant.HttpStatus;
 import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.cache.ICompanyUserCacheService;
 import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
+import com.fs.store.domain.FsUser;
 import com.fs.store.param.h5.FsUserPageListParam;
 import com.fs.store.service.IFsUserService;
 import com.fs.store.vo.h5.FsUserPageListVO;
@@ -17,10 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -76,5 +77,26 @@ public class FsUserAdminController extends BaseController {
         return R.error();
     }
 
+    /**
+     * 获取用户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('store:user:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(fsUserService.selectFsUserById(userId));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('store:user:edi')")
+    @Log(title = "用户", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsUser fsUser)
+    {
+        return toAjax(fsUserService.updateFsUser(fsUser));
+    }
+
 
 }

+ 6 - 0
fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -194,6 +194,12 @@ public class FsUserServiceImpl implements IFsUserService
     @Override
     public int updateFsUser(FsUser fsUser)
     {
+        String nickname = fsUser.getNickname();
+        if (StringUtils.isNotBlank(nickname)){
+            if (nickname.length()>100){
+                return 0;
+            }
+        }
         fsUser.setUpdateTime(DateUtils.getNowDate());
         return fsUserMapper.updateFsUser(fsUser);
     }