From 5700f42a37a2f9ecc27161e2b0559a820d320f6b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 17 三月 2025 15:11:40 +0800
Subject: [PATCH] 开发完成同一个手机号登录不同物业公司的支持

---
 service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java |    3 
 service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java                                |   14 +-
 java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityVo.java                         |   20 +++++
 service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java                           |   12 +-
 service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java                           |   97 +++++++++++++----------
 java110-bean/src/main/java/com/java110/dto/user/UserDto.java                                        |   10 ++
 java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml                              |   24 ++++--
 service-api/src/main/java/com/java110/api/smo/login/impl/LoginServiceSMOImpl.java                   |   21 ++++-
 8 files changed, 133 insertions(+), 68 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/user/UserDto.java b/java110-bean/src/main/java/com/java110/dto/user/UserDto.java
index cbb5aab..c706b99 100755
--- a/java110-bean/src/main/java/com/java110/dto/user/UserDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/user/UserDto.java
@@ -100,6 +100,8 @@
 
     private String createTime;
 
+    private String storeName;
+
 
 
     public String getUserId() {
@@ -437,4 +439,12 @@
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
 }
diff --git a/java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityVo.java b/java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityVo.java
index 5f63d4c..710df2c 100755
--- a/java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityVo.java
@@ -8,6 +8,10 @@
 public class ApiCommunityVo extends MorePageVo implements Serializable {
     List<ApiCommunityDataVo> communitys;
 
+    private int code;
+
+    private String msg;
+
 
     public List<ApiCommunityDataVo> getCommunitys() {
         return communitys;
@@ -16,4 +20,20 @@
     public void setCommunitys(List<ApiCommunityDataVo> communitys) {
         this.communitys = communitys;
     }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
 }
diff --git a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index 95afaaf..ac14634 100755
--- a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -466,7 +466,7 @@
     <!-- 鏌ヨ鍛樺伐鎬婚噺 -->
     <select id="getStaffCount" parameterType="Map" resultType="Map">
         <if test="orgIds != null and orgIds.length > 0">
-        select count(*) count from(
+            select count(*) count from(
         </if>
         select count(1) count
         from u_user u
@@ -475,14 +475,17 @@
             left join u_org_staff_rel uosr on u.user_id = uosr.staff_id and uosr.status_cd = '0'
             left join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
         </if>
-        where u.level_cd = '01'
+        where su.status_cd = '0'
+        and u.status_cd = '0'
+        <if test="levelCd !=null and levelCd != ''">
+            and u.level_cd = #{levelCd}
+        </if>
         <if test="storeId !=null and storeId != ''">
             and su.store_id = #{storeId}
         </if>
         <if test="orgId !=null and orgId != ''">
             and uosr.org_id = #{orgId}
         </if>
-        and u.status_cd = '0'
         <if test="tel !=null and tel != ''">
             and u.tel= #{tel}
         </if>
@@ -527,27 +530,32 @@
     <select id="getStaffs" parameterType="Map" resultType="Map">
         select u.user_id, u.user_id userId,u.name,u.name
         userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
-        u.age,u.sex,u.tel,u.level_cd levelCd,u.b_id,su.rel_cd relCd,td.name relCdName,ua.value idCard
+        u.age,u.sex,u.tel,u.level_cd levelCd,u.b_id,su.rel_cd relCd,td.name relCdName,ua.value idCard,s.name storeName
         <if test="orgId !=null and orgId != ''">
             ,uo.org_id orgId,uo.org_name,uo.org_name orgName,uosr.store_id storeId,uosr.rel_id relId
         </if>
         from
         u_user u
         inner join s_store_user su on su.user_id = u.user_id
+        left join s_store s on su.store_id = s.store_id
         left join t_dict td on su.rel_cd = td.status_cd and td.table_name='s_store_user' and td.table_columns='rel_cd'
         left join u_user_attr ua on ua.user_id = u.user_id and ua.spec_cd = '100202406002' and ua.status_cd = '0'
         <if test="(orgId !=null and orgId != '')||(orgIds != null and orgIds.length > 0)">
             left join u_org_staff_rel uosr on u.user_id = uosr.staff_id and uosr.status_cd = '0'
             left join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
         </if>
-        where u.level_cd = '01'
+        where su.status_cd = '0'
+        and u.status_cd = '0'
+        and s.status_cd = '0'
+        <if test="levelCd !=null and levelCd != ''">
+            and u.level_cd = #{levelCd}
+        </if>
         <if test="storeId !=null and storeId != ''">
             and su.store_id = #{storeId}
         </if>
         <if test="orgId !=null and orgId != ''">
             and uosr.org_id = #{orgId}
         </if>
-        and u.status_cd = '0'
         <if test="tel !=null and tel != ''">
             and u.tel= #{tel}
         </if>
@@ -583,7 +591,7 @@
             and uosr.status_cd =0
             GROUP BY u.user_id,u.name,u.email,u.address,u.location_cd,
             u.age,u.sex,u.tel,u.level_cd ,u.b_id,su.rel_cd ,td.name
-            ,uo.org_id,uo.org_name,uosr.store_id,uosr.rel_id,ua.value
+            ,uo.org_id,uo.org_name,uosr.store_id,uosr.rel_id,ua.value,s.name
         </if>
         order by u.create_time desc
         <if test="page != -1 and page != null ">
@@ -696,7 +704,7 @@
         where 1= 1
         <if test="openId != null and openId != ''">
             and u.user_id = ua.user_id
-            and ua.spec_cd  in ('100201911001','100201911003')
+            and ua.spec_cd in ('100201911001','100201911003')
             and ua.value = #{openId}
             and ua.status_cd = '0'
         </if>
diff --git a/service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java b/service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java
index 774860f..bb091b0 100644
--- a/service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java
+++ b/service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java
@@ -194,13 +194,13 @@
      */
     private String getToken(HttpServletRequest request) throws FilterException {
         String token = "";
-        if (request.getCookies() != null && request.getCookies().length > 0) {
-            for (Cookie cookie : request.getCookies()) {
-                if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
-                    token = cookie.getValue();
-                }
-            }
-        }
+//        if (request.getCookies() != null && request.getCookies().length > 0) {
+//            for (Cookie cookie : request.getCookies()) {
+//                if (CommonConstant.COOKIE_AUTH_TOKEN.equals(cookie.getName())) {
+//                    token = cookie.getValue();
+//                }
+//            }
+//        }
         String authorization = request.getHeader("Authorization");
 
         if(StringUtil.isEmpty(token) && !StringUtil.isEmpty(authorization)){
diff --git a/service-api/src/main/java/com/java110/api/smo/login/impl/LoginServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/login/impl/LoginServiceSMOImpl.java
index 8989863..93f8060 100644
--- a/service-api/src/main/java/com/java110/api/smo/login/impl/LoginServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/login/impl/LoginServiceSMOImpl.java
@@ -1,5 +1,6 @@
 package com.java110.api.smo.login.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.api.smo.login.ILoginServiceSMO;
@@ -10,6 +11,7 @@
 import com.java110.core.log.LoggerFactory;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,9 +57,20 @@
 
         loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("passwd")));
         responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), "login.pcUserLogin", HttpMethod.POST);
-        if (responseEntity.getStatusCode() == HttpStatus.OK) {
-            JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
-            pd.setToken(userInfo.getString("token"));
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+        JSONObject resultVo = JSONArray.parseObject(responseEntity.getBody());
+        if(resultVo.getIntValue("code") != 0){
+            return responseEntity;
+        }
+        JSONArray data = resultVo.getJSONArray("data");
+        if (ListUtil.isNull(data)) {
+            return responseEntity;
+        }
+        for (int userIndex = 0; userIndex < data.size(); userIndex++) {
+            JSONObject userInfo = data.getJSONObject(userIndex);
+           // pd.setToken(userInfo.getString("token"));
             //娓呯悊缂撳瓨
             clearUserCache(userInfo);
         }
@@ -74,7 +87,7 @@
         String storeId = "";
 
         String storeInfo = CommonCache.getValue("getStoreInfo" + Java110RedisConfig.GET_STORE_INFO_EXPIRE_TIME_KEY + "::" + userInfo.getString("userId"));
-        if(!StringUtil.isEmpty(storeInfo)){
+        if (!StringUtil.isEmpty(storeInfo)) {
             CommonCache.removeValue("getStoreInfo" + Java110RedisConfig.GET_STORE_INFO_EXPIRE_TIME_KEY + "::" + userInfo.getString("userId"));
             JSONObject storeObj = JSONObject.parseObject(storeInfo);
             storeId = storeObj.getJSONObject("msg").getString("storeId");
diff --git a/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java b/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
index 6e1b4b1..86f80e1 100644
--- a/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
@@ -17,6 +17,7 @@
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import com.java110.vo.api.community.ApiCommunityDataVo;
 import com.java110.vo.api.community.ApiCommunityVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,6 +132,8 @@
         apiCommunityVo.setTotal(count);
         apiCommunityVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
         apiCommunityVo.setCommunitys(communitys);
+        apiCommunityVo.setCode(ResultVo.CODE_OK);
+        apiCommunityVo.setMsg(ResultVo.MSG_OK);
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiCommunityVo), HttpStatus.OK);
         context.setResponseEntity(responseEntity);
     }
diff --git a/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
index 93f456b..9ea5879 100644
--- a/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
@@ -1,5 +1,6 @@
 package com.java110.user.cmd.login;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
@@ -26,6 +27,7 @@
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ListUtil;
+import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -55,30 +57,30 @@
 
 @Java110ParamsDoc(
         headers = {
-                @Java110HeaderDoc(name="APP-ID",defaultValue = "閫氳繃dev璐︽埛鍒嗛厤搴旂敤",description = "搴旂敤APP-ID"),
-                @Java110HeaderDoc(name="TRANSACTION-ID",defaultValue = "uuid",description = "浜ゆ槗娴佹按鍙�"),
-                @Java110HeaderDoc(name="REQ-TIME",defaultValue = "20220917120915",description = "璇锋眰鏃堕棿 YYYYMMDDhhmmss"),
-                @Java110HeaderDoc(name="JAVA110-LANG",defaultValue = "zh-cn",description = "璇█涓枃"),
-                @Java110HeaderDoc(name="USER-ID",defaultValue = "-1",description = "璋冪敤鐢ㄦ埛ID 涓�鑸啓-1"),
+                @Java110HeaderDoc(name = "APP-ID", defaultValue = "閫氳繃dev璐︽埛鍒嗛厤搴旂敤", description = "搴旂敤APP-ID"),
+                @Java110HeaderDoc(name = "TRANSACTION-ID", defaultValue = "uuid", description = "浜ゆ槗娴佹按鍙�"),
+                @Java110HeaderDoc(name = "REQ-TIME", defaultValue = "20220917120915", description = "璇锋眰鏃堕棿 YYYYMMDDhhmmss"),
+                @Java110HeaderDoc(name = "JAVA110-LANG", defaultValue = "zh-cn", description = "璇█涓枃"),
+                @Java110HeaderDoc(name = "USER-ID", defaultValue = "-1", description = "璋冪敤鐢ㄦ埛ID 涓�鑸啓-1"),
         },
         params = {
-        @Java110ParamDoc(name = "username", length = 30, remark = "鐢ㄦ埛鍚嶏紝鐗╀笟绯荤粺鍒嗛厤"),
-        @Java110ParamDoc(name = "passwd", length = 30, remark = "瀵嗙爜锛岀墿涓氱郴缁熷垎閰�"),
-})
+                @Java110ParamDoc(name = "username", length = 30, remark = "鐢ㄦ埛鍚嶏紝鐗╀笟绯荤粺鍒嗛厤"),
+                @Java110ParamDoc(name = "passwd", length = 30, remark = "瀵嗙爜锛岀墿涓氱郴缁熷垎閰�"),
+        })
 
 @Java110ResponseDoc(
         params = {
                 @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
                 @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
                 @Java110ParamDoc(name = "data", type = "Object", remark = "鏈夋晥鏁版嵁"),
-                @Java110ParamDoc(parentNodeName = "data",name = "userId", type = "String", remark = "鐢ㄦ埛ID"),
-                @Java110ParamDoc(parentNodeName = "data",name = "token", type = "String", remark = "涓存椂绁ㄦ嵁"),
+                @Java110ParamDoc(parentNodeName = "data", name = "userId", type = "String", remark = "鐢ㄦ埛ID"),
+                @Java110ParamDoc(parentNodeName = "data", name = "token", type = "String", remark = "涓存椂绁ㄦ嵁"),
         }
 )
 
 @Java110ExampleDoc(
-        reqBody="{'username':'wuxw','passwd':'admin'}",
-        resBody="{'code':0,'msg':'鎴愬姛','data':{'userId':'123123','token':'123213'}}"
+        reqBody = "{'username':'wuxw','passwd':'admin'}",
+        resBody = "{'code':0,'msg':'鎴愬姛','data':{'userId':'123123','token':'123213'}}"
 )
 @Java110Cmd(serviceCode = "login.pcUserLogin")
 public class PcUserLoginCmd extends Cmd {
@@ -94,12 +96,8 @@
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        String paramIn = cmdDataFlowContext.getReqData();
-        Assert.isJsonObject(paramIn, "鐢ㄦ埛娉ㄥ唽璇锋眰鍙傛暟鏈夎锛屼笉鏄湁鏁堢殑json鏍煎紡 " + paramIn);
-        Assert.jsonObjectHaveKey(paramIn, "username", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈username鑺傜偣锛岃妫�鏌�" + paramIn);
-        Assert.jsonObjectHaveKey(paramIn, "passwd", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈passwd鑺傜偣锛岃妫�鏌�" + paramIn);
-
-
+        Assert.hasKeyAndValue(reqJson, "username", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈username鑺傜偣锛岃妫�鏌�");
+        Assert.hasKeyAndValue(reqJson, "passwd", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈passwd鑺傜偣锛岃妫�鏌�");
 
         AuthenticationFactory.checkLoginErrorCount(reqJson.getString("username"));
     }
@@ -140,32 +138,45 @@
                 return;
             }
         }
-
-
-        try {
-            Map userMap = new HashMap();
-            userMap.put(CommonConstant.LOGIN_USER_ID, userDtos.get(0).getUserId());
-            userMap.put(CommonConstant.LOGIN_USER_NAME, userDtos.get(0).getUserName());
-            String token = AuthenticationFactory.createAndSaveToken(userMap);
-            JSONObject userInfo = BeanConvertUtil.beanCovertJson(userDtos.get(0));
-            userInfo.remove("userPwd");
-            userInfo.put("token", token);
-            //璁板綍鐧诲綍鏃ュ織
-            UserLoginPo userLoginPo = new UserLoginPo();
-            userLoginPo.setLoginId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_loginId));
-            userLoginPo.setLoginTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-            userLoginPo.setPassword(userDtos.get(0).getPassword());
-            userLoginPo.setSource(UserLoginDto.SOURCE_WEB);
-            userLoginPo.setToken(token);
-            userLoginPo.setUserId(userInfo.getString("userId"));
-            userLoginPo.setUserName(userInfo.getString("userName"));
-            userLoginInnerServiceSMOImpl.saveUserLogin(userLoginPo);
-            responseEntity = new ResponseEntity<String>(userInfo.toJSONString(), HttpStatus.OK);
-            cmdDataFlowContext.setResponseEntity(responseEntity);
-        } catch (Exception e) {
-            logger.error("鐧诲綍寮傚父锛�", e);
-            throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "绯荤粺鍐呴儴閿欒锛岃鑱旂郴绠$悊鍛�");
+        UserDto allUserDto = new UserDto();
+        allUserDto.setTel(userDtos.get(0).getTel());
+        userDtos = userInnerServiceSMOImpl.getStaffs(userDto);
+        if (userDtos.isEmpty()) {
+            throw new CmdException("鐢ㄦ埛涓嶅瓨鍦�");
         }
+        JSONArray data = new JSONArray();
+        JSONObject userInfo = null;
+        for(UserDto aUserDto: userDtos) {
+            try {
+                Map userMap = new HashMap();
+                userMap.put(CommonConstant.LOGIN_USER_ID, aUserDto.getUserId());
+                userMap.put(CommonConstant.LOGIN_USER_NAME, aUserDto.getUserName());
+                String token = AuthenticationFactory.createAndSaveToken(userMap);
+                userInfo= BeanConvertUtil.beanCovertJson(aUserDto);
+                userInfo.remove("userPwd");
+                userInfo.put("token", token);
+                data.add(userInfo);
+            } catch (Exception e) {
+                logger.error("鐧诲綍寮傚父锛�", e);
+                throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "绯荤粺鍐呴儴閿欒锛岃鑱旂郴绠$悊鍛�");
+            }
+        }
+
+
+        //璁板綍鐧诲綍鏃ュ織
+        UserLoginPo userLoginPo = new UserLoginPo();
+        userLoginPo.setLoginId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_loginId));
+        userLoginPo.setLoginTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        userLoginPo.setPassword("******");
+        userLoginPo.setSource(UserLoginDto.SOURCE_WEB);
+        userLoginPo.setToken(userInfo.getString("token"));
+        userLoginPo.setUserId(userInfo.getString("userId"));
+        userLoginPo.setUserName(userInfo.getString("userName"));
+        userLoginInnerServiceSMOImpl.saveUserLogin(userLoginPo);
+
+
+        responseEntity = ResultVo.createResponseEntity(data);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 
 }
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
index c51d701..df53624 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -92,18 +93,17 @@
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        if (!reqJson.containsKey("storeId")) {
-            String storeId = context.getReqHeaders().get("store-id");
-            reqJson.put("storeId", storeId);
-        }
+        String storeId = CmdContextUtils.getStoreId(context);
+        Assert.hasLength(storeId, "鐢ㄦ埛鏈櫥褰�");
+
         //鑾峰彇鏁版嵁涓婁笅鏂囧璞�
-        Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
         //鍒ゆ柇鍛樺伐鎵嬫満鍙锋槸鍚﹂噸澶�(鍛樺伐鍙牴鎹墜鏈哄彿鐧诲綍骞冲彴)
         UserDto userDto = new UserDto();
         userDto.setTel(reqJson.getString("tel"));
         userDto.setUserFlag("1");
         userDto.setLevelCd("01"); //鍛樺伐
-        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+        userDto.setStoreId(storeId);
+        List<UserDto> users = userInnerServiceSMOImpl.getStaffs(userDto);
         Assert.listIsNull(users, "鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
     }
 

--
Gitblit v1.8.0