Tenlion/btxtgxq-system-city
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改app通讯录和请假

Browse Source
This commit is contained in:
wans 2021-07-06 14:46:59 +08:00
parent 01ca20b474
commit b9c5c9062b
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java
View File

@ -360,6 +360,14 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun
@Override @Override
public List<CommunityBossDTO> listCommunityBossDetail(Map<String, Object> params) throws SearchException { public List<CommunityBossDTO> listCommunityBossDetail(Map<String, Object> params) throws SearchException {
if(params.get("communityBossParentId") != null
&& !"".equals(params.get("communityBossParentId").toString())
&& !"0".equals(params.get("communityBossParentId").toString())){
Map<String, Object> query = new HashMap<>(4);
query.put("communityBossId",params.get("communityBossParentId").toString());
CommunityBossDTO communityBoss = communityBossService.getCommunityBoss(query);
params.put("communityBossParentUserId",communityBoss.getCommunityBossUserId());
}
return communityBossDao.listCommunityBossDetail(params); return communityBossDao.listCommunityBossDetail(params);
} }

15
src/main/java/com/cm/systemcity/service/leave/impl/LeaveServiceImpl.java
View File

@ -83,15 +83,20 @@ public class LeaveServiceImpl extends BaseService implements ILeaveService {
approverName = nLeaders.getJSONObject(0).getString("userName"); approverName = nLeaders.getJSONObject(0).getString("userName");
} else { } else {
LOG.debug("不是N员，查询是不是网格长"); LOG.debug("不是N员，查询是不是网格长");
userParams.put("communityBossId", appTokenUser.getId()); /**
* 小王帅 2021年7月6日09:20:01
* 修改 userParams.put("communityBossId", appTokenUser.getId());
*/
userParams.put("communityBossUserId", appTokenUser.getId());
CommunityBossDTO communityBossDTO = communityBossService.getCommunityBoss(userParams); CommunityBossDTO communityBossDTO = communityBossService.getCommunityBoss(userParams);
if (communityBossDTO.getCommunityBossLevel() != 3) { if (communityBossDTO.getCommunityBossLevel() < 2) {
throw new SearchException("非三级网格长和N员"); throw new SearchException("三、四、五网格长和专管员才可以请假");
} }
LOG.debug("查询二级网格长"); LOG.debug("查询上级网格长");
userParams.clear();
userParams.put("communityBossId", communityBossDTO.getCommunityBossParentId()); userParams.put("communityBossId", communityBossDTO.getCommunityBossParentId());
communityBossDTO = communityBossService.getCommunityBoss(userParams); communityBossDTO = communityBossService.getCommunityBoss(userParams);
approverId = communityBossDTO.getCommunityBossId(); approverId = communityBossDTO.getCommunityBossUserId();
approverName = communityBossDTO.getCommunityBossName(); approverName = communityBossDTO.getCommunityBossName();
} }
params.put("approverId", approverId); params.put("approverId", approverId);

7
src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml
View File

@ -356,12 +356,15 @@
t1.area_id, t1.area_id,
t1.area_name, t1.area_name,
t1.grid_summary, t1.grid_summary,
t4.user_name community_boss_name,
t4.user_phone community_boss_phone,
GROUP_CONCAT(t3.community_id) community_ids, GROUP_CONCAT(t3.community_id) community_ids,
GROUP_CONCAT(t3.community_name) community_names GROUP_CONCAT(t3.community_name) community_names
FROM FROM
city_community_boss t1 city_community_boss t1
LEFT JOIN city_community_boss_community t2 ON t1.community_boss_id = t2.community_boss_id LEFT JOIN city_community_boss_community t2 ON t1.community_boss_id = t2.community_boss_id
LEFT JOIN city_community t3 ON t2.community_id = t3.community_id AND t3.is_delete = 0 LEFT JOIN city_community t3 ON t2.community_id = t3.community_id AND t3.is_delete = 0
LEFT JOIN sys_user t4 ON t1.community_boss_user_id = t4.user_id
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
GROUP BY GROUP BY

2
src/main/resources/static/route/userpoints/map_user.html
View File

@ -28,7 +28,7 @@
</select> </select>
</div> </div>
<div class="layui-inline layui-form area-select-item" id="selectNPersonBox" style="display: none;"> <div class="layui-inline layui-form area-select-item" id="selectNPersonBox" style="display: none;">
<input type="text" id="selectNPerson" class="layui-input area-edit" value="" placeholder="选择N人员" lay-verify="required" readonly style="cursor: pointer;"> <input type="text" id="selectNPerson" class="layui-input area-edit" value="" placeholder="选择专管员" lay-verify="required" readonly style="cursor: pointer;">
</div> </div>
<div id="userBox"> <div id="userBox">
<div class="layui-inline layui-form area-select-item" id="area1SelectTemplateBox" lay-filter="area1SelectTemplateBox"></div> <div class="layui-inline layui-form area-select-item" id="area1SelectTemplateBox" lay-filter="area1SelectTemplateBox"></div>