Commit 7740ade9 authored by wzp's avatar wzp

修改机构管理

parent 9d9a48f9
...@@ -17,4 +17,6 @@ import java.util.Map; ...@@ -17,4 +17,6 @@ import java.util.Map;
public interface TAreaMapper extends BaseMapper<TArea> { public interface TAreaMapper extends BaseMapper<TArea> {
List<Map<String,String>> languageInfo(); List<Map<String,String>> languageInfo();
String selectParent(String areaId);
} }
...@@ -104,5 +104,12 @@ public class TOrgan implements Serializable { ...@@ -104,5 +104,12 @@ public class TOrgan implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String areaName; private String areaName;
@ApiModelProperty("区域集合")
@TableField(exist = false)
private List<String> areas;
@ApiModelProperty("当前操作级别")
@TableField(exist = false)
private Integer currentLevel;
} }
...@@ -146,6 +146,10 @@ public class TUser implements Serializable { ...@@ -146,6 +146,10 @@ public class TUser implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String areaName; private String areaName;
@ApiModelProperty("区域集合")
@TableField(exist = false)
private List<String> areas;
@TableField(exist = false) @TableField(exist = false)
private String jwtToken; private String jwtToken;
......
...@@ -2,9 +2,12 @@ package cn.wisenergy.chnmuseum.party.service.impl; ...@@ -2,9 +2,12 @@ package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.common.util.DateUtil80; import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
import cn.wisenergy.chnmuseum.party.mapper.TAreaMapper;
import cn.wisenergy.chnmuseum.party.model.TArea;
import cn.wisenergy.chnmuseum.party.model.TOrgan; import cn.wisenergy.chnmuseum.party.model.TOrgan;
import cn.wisenergy.chnmuseum.party.mapper.TOrganMapper; import cn.wisenergy.chnmuseum.party.mapper.TOrganMapper;
import cn.wisenergy.chnmuseum.party.service.TOrganService; import cn.wisenergy.chnmuseum.party.service.TOrganService;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -31,6 +34,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -31,6 +34,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
@Resource @Resource
private TOrganMapper organMapper; private TOrganMapper organMapper;
@Resource
private TAreaMapper areaMapper;
@Override @Override
public List<TOrgan> getTree() { public List<TOrgan> getTree() {
List<TOrgan> list = list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).orderByDesc(TOrgan::getLevel)); List<TOrgan> list = list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).orderByDesc(TOrgan::getLevel));
...@@ -91,6 +97,11 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -91,6 +97,11 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
@Override @Override
public TOrgan selectById(String id) { public TOrgan selectById(String id) {
return organMapper.getById(id); TOrgan organ = organMapper.getById(id);
String s = areaMapper.selectParent(organ.getAreaId());
List<TOrgan> list1 = list(new UpdateWrapper<TOrgan>().eq("parent_id", organ.getParentId()));
organ.setAreas(Arrays.asList(s.split(",")));
organ.setChildren(list1);
return organ;
} }
} }
package cn.wisenergy.chnmuseum.party.service.impl; package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.mapper.TAreaMapper;
import cn.wisenergy.chnmuseum.party.model.TUser; import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.mapper.TUserMapper; import cn.wisenergy.chnmuseum.party.mapper.TUserMapper;
import cn.wisenergy.chnmuseum.party.service.TUserService; import cn.wisenergy.chnmuseum.party.service.TUserService;
...@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays;
/** /**
* <pre> * <pre>
...@@ -28,6 +30,9 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ...@@ -28,6 +30,9 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Resource @Resource
private TUserMapper tUserMapper; private TUserMapper tUserMapper;
@Resource
private TAreaMapper areaMapper;
@Override @Override
public TUser selectByUsername(String userName) { public TUser selectByUsername(String userName) {
return tUserMapper.selectByUsername(userName); return tUserMapper.selectByUsername(userName);
...@@ -40,6 +45,11 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ...@@ -40,6 +45,11 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Override @Override
public TUser selectById(String id) { public TUser selectById(String id) {
return tUserMapper.getById(id); TUser user = tUserMapper.getById(id);
if (user.getAreaId()!=null) {
String s = areaMapper.selectParent(user.getAreaId());
user.setAreas(Arrays.asList(s.split(",")));
}
return user;
} }
} }
...@@ -74,6 +74,10 @@ public class TOrganController extends BaseController { ...@@ -74,6 +74,10 @@ public class TOrganController extends BaseController {
public Map<String, Object> add(TOrgan organ) { public Map<String, Object> add(TOrgan organ) {
organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis())); organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis())); organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
if(organ.getLevel()==2&&organ.getCurrentLevel()!=null&&organ.getCurrentLevel()==3){
TArea byId = tAreaService.getById(organ.getParentId());
organ.setParentId(byId.getParentId());
}
// 保存业务节点信息 // 保存业务节点信息
boolean result = tOrganService.save(organ); boolean result = tOrganService.save(organ);
// 返回操作结果 // 返回操作结果
......
...@@ -25,4 +25,11 @@ ...@@ -25,4 +25,11 @@
<select id="languageInfo" resultType="java.util.HashMap"> <select id="languageInfo" resultType="java.util.HashMap">
select id,name,code from t_language select id,name,code from t_language
</select> </select>
<select id="selectParent" resultType="java.lang.String">
select concat(ifnull(concat(a1.parent_id,','),''),ifnull(concat(a.parent_id,','),''),a.id)
from t_area a
left join t_area a1 on a.parent_id = a1.id
where a.id = #{areaId}
</select>
</mapper> </mapper>
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