1

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -148,6 +148,16 @@ public class SysUser extends BaseEntity
 
     //应用类型对应关系
     private List<Map<String,Object> >loginTypeList;
+   //门店对应关系
+    private List<Map<String,Object> >loginTypeInfo;
+
+    public void setLoginTypeInfo(List<Map<String, Object>> loginTypeInfo) {
+        this.loginTypeInfo = loginTypeInfo;
+    }
+
+    public List<Map<String, Object>> getLoginTypeInfo() {
+        return loginTypeInfo;
+    }
 
     public void setLoginTypeList(List<Map<String, Object>> loginTypeList) {
         this.loginTypeList = loginTypeList;

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -504,20 +504,21 @@ public class WxController extends ApiBaseController {
         }
         String pass = EncryptPassWordClass.encryptPassword(user.getLoginName(), password, user.getSalt());
         List<Map<String, Object>> result = new ArrayList<>();
+        List<Map<String, Object>> loginTypeList = jdbcTemplate.queryForList("select dict_label shopType,dict_value shopTypeValue  from sys_dict_data where  dict_type='system_login_type'  ");
 
         if (pass.equals(user.getPassword())) {
-            List<Map<String, Object>> loginTypeList = jdbcTemplate.queryForList("select dict_label,dict_value  from sys_dict_data where  dict_type='system_login_type'  ");
             if ("1".equals(user.getIsShopAccount())) {
                 for (int i = 0; i < loginTypeList.size(); i++) {
                     Map m = new HashMap();
-                    m.put("shopType", loginTypeList.get(i).get("dict_label"));
-                    m.put("shopTypeValue", loginTypeList.get(i).get("dict_value"));
+                    m.put("shopType", loginTypeList.get(i).get("shopType"));
+                    m.put("shopTypeValue", loginTypeList.get(i).get("shopTypeValue"));
                     List<Map<String, Object>> shopList = jdbcTemplate.queryForList("select shop_code,shop_name,sales_level from sys_user_shop_ext where  user_id=? and is_shop_type=? and del_flag='0'", user.getUserId(), loginTypeList.get(i).get("dict_value"));
                     m.put("shopList", shopList);
                     result.add(m);
                 }
                 user.setLoginTypeList(result);
             }else{
+                user.setLoginTypeInfo(loginTypeList);
                 user.setLoginTypeList(result);
             }
                 List<Ztree> author = sysUserOrderAuthorService.userAuthorTreeDataFmt(user.getUserId());