From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug

---
 service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
index 2d4d926..ce4a9e8 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
@@ -7,6 +7,7 @@
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.org.OrgStaffRelDto;
@@ -26,15 +27,52 @@
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
+
+@Java110CmdDoc(title = "淇敼鍛樺伐",
+        description = "澶栭儴绯荤粺閫氳繃淇敼鍛樺伐鎺ュ彛 淇敼鍛樺伐锛屾敞鎰忛渶瑕佺墿涓氱鐞嗗憳璐﹀彿鐧诲綍锛屽洜涓轰笉闇�瑕佷紶storeId 鏄牴鎹鐞嗗憳鐧诲綍淇℃伅鑾峰彇鐨�",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/user.staff.modify",
+        resource = "userDoc",
+        author = "鍚村鏂�",
+        serviceCode = "user.staff.modify"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "userId", length = 30, remark = "鍛樺伐ID"),
+        @Java110ParamDoc(name = "orgId", length = 30, remark = "缁勭粐ID"),
+        @Java110ParamDoc(name = "orgName", length = 64, remark = "缁勭粐鍚嶇О"),
+        @Java110ParamDoc(name = "name", length = 64, remark = "鍚嶇О"),
+        @Java110ParamDoc(name = "sex", length = 64, remark = "鎬у埆 0濂� 1鐢�"),
+        @Java110ParamDoc(name = "email", length = 64, remark = "閭"),
+        @Java110ParamDoc(name = "tel", length = 11, remark = "鎵嬫満鍙�"),
+        @Java110ParamDoc(name = "address", length = 64, remark = "鍦板潃"),
+        @Java110ParamDoc(name = "relCd", length = 64, remark = "宀椾綅,鏅�氬憳宸� 1000 閮ㄩ棬缁忕悊 2000 閮ㄩ棬鍓粡鐞� 3000 閮ㄩ棬缁勯暱 4000 鍒嗗叕鍙告�荤粡鐞� 5000 鍒嗗叕鍙稿壇鎬荤粡鐞� 6000 鎬荤粡鐞嗗姪鐞� 7000 鎬诲叕鍙告�荤粡鐞� 8000 鎬诲叕鍙稿壇鎬荤粡鐞� 9000"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"userId\":\"123123\",\"orgId\":\"102022091988250052\",\"orgName\":\"婕旂ず鐗╀笟 / 浠堕儴\",\"username\":\"寮犱笁\",\"sex\":\"0\",\"email\":\"231@qq.com\",\"tel\":\"123\",\"address\":\"123\",\"relCd\":\"1000\",\"photo\":\"\",\"name\":\"寮犱笁\"}",
+        resBody="{'code':0,'msg':'鎴愬姛'"
+)
+
 @Java110Cmd(serviceCode = "user.staff.modify")
 public class UserStaffModifyCmd extends Cmd {
+
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
@@ -126,6 +164,9 @@
                 }
             }
         }
+        if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
+            Assert.isEmail(paramObj, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
+        }
         int flag = userV1InnerServiceSMOImpl.updateUser(userPo);
 
         if (flag < 1) {

--
Gitblit v1.8.0