zxfqwert hace 3 meses
padre
commit
bc3f84a8da

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

@@ -142,6 +142,8 @@ public class SysUser extends BaseEntity
     //2离职
     private String quit;
 
+    private String  isShopAccount;
+
     public String getQuit(){return  quit;}
 
     public  void setQuit(String quit){this.quit=quit;}
@@ -569,6 +571,14 @@ public class SysUser extends BaseEntity
         this.isSync = isSync;
     }
 
+    public void setIsShopAccount(String isShopAccount) {
+        this.isShopAccount = isShopAccount;
+    }
+
+    public String getIsShopAccount() {
+        return isShopAccount;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 1 - 0
suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="isSelfDelivery" column="is_self_delivery" />
 		<result property="isSync"       column="is_sync"       />
 		<result property="quit"       column="quit"       />
+		<result property="isShopAccount"       column="is_shop_account"       />
 		<result property="isAuthentication"       column="is_authentication"       />
 		<result property="personAttestationTime"       column="person_attestation_time"       />
 		<result property="isOrgAuthentication"       column="is_org_authentication"       />

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

@@ -7,6 +7,7 @@ import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
 import com.dgtly.common.core.domain.Ztree;
+import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.bean.EnDecoderUtil;
 import com.dgtly.common.utils.bean.HexUtils;
 import com.dgtly.common.utils.http.HttpUtils;
@@ -28,6 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
@@ -478,6 +480,11 @@ public class WxController extends ApiBaseController {
         return AjaxResult.error(301,"根据Ticket获取用户信息失败");
     }
 
+
+
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     @ApiOperation(value = "根据账户密码获取用户信息",notes = "参数:{'username':'1','password':'xxx'}" +
             " 错误:301 密码错误" +
             "错误:302  查无此人")
@@ -490,8 +497,13 @@ public class WxController extends ApiBaseController {
         obj.checkParameterNotNull("username,password");
         String username = obj.getString("username");
         String password = obj.getString("password");
-        String type=obj.getString("type");
+        String logintype=obj.getString("logintype");
         SysUser user = sysUserService.selectUserByLoginName(username);
+        //通过字典判断  logintype 查询客户需要传值类型
+         if(StringUtils.isNotBlank(logintype)){
+            List<Map<String,Object>> loginType= jdbcTemplate.queryForList("select dict_value  from sys_dict_data where  dict_type=''  and ",);
+         }
+
         if(user==null){
             return AjaxResult.error(302,"查无此人");
         }