Commit 7f09aa37 authored by 扫地僧's avatar 扫地僧

修改首页员工展示逻辑和后台普通管理员添加员工获取对应店铺集合的逻辑

parent e7b31f0a
...@@ -113,10 +113,16 @@ public class StoreController extends BaseController { ...@@ -113,10 +113,16 @@ public class StoreController extends BaseController {
*/ */
@RequestMapping("getStores") @RequestMapping("getStores")
@ResponseBody @ResponseBody
public ResultInfo<List<Map<String,Object>>> getStores(){ public ResultInfo<List<Map<String,Object>>> getStores(String userId){
ResultInfo<List<Map<String,Object>>> result = new ResultInfo<>(); ResultInfo<List<Map<String,Object>>> result = new ResultInfo<>();
List<Map<String,Object>> listQuery = new ArrayList<>(); List<Map<String,Object>> listQuery = new ArrayList<>();
Store store = new Store(); Store store = new Store();
SysUser user = sysUserService.detail(userId);
if (user!=null) {
if (!"1".equals(user.getFlag())) {
store.setUserId(userId);
}
}
store.setIsDeleted(0); store.setIsDeleted(0);
store.setIsAuditing(1); store.setIsAuditing(1);
List<Store> storeList = storeService.getStoreList(new Query(store)); List<Store> storeList = storeService.getStoreList(new Query(store));
......
...@@ -266,6 +266,7 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF ...@@ -266,6 +266,7 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
AND IS_AUDITING=1 AND IS_AUDITING=1
AND IS_SHOPPING=1 AND IS_SHOPPING=1
</where> </where>
ORDER BY SERIAL_NUMBER ASC,CLICKS DESC
</select> </select>
<select id="getByIds" resultMap="Worker"> <select id="getByIds" resultMap="Worker">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment