|
@@ -187,46 +187,6 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
|
|
@Override
|
|
@Override
|
|
public AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm) {
|
|
public AjaxResult toQianshan(String rc, String djsjqs, String djsjjs, String name, String sfzhm) {
|
|
|
|
|
|
- //判断传入的地区在不在账号权限内
|
|
|
|
- //获取账号区划权限
|
|
|
|
- /*SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
|
|
|
|
- SysDept dept = sysUser.getDept();
|
|
|
|
- if (StringUtils.isEmpty(rc) && StringUtils.isEmpty(sfzhm)) {
|
|
|
|
- rc = dept.getDeptName();
|
|
|
|
- }
|
|
|
|
- if (StringUtils.isNotEmpty(rc)) {
|
|
|
|
- //判断账号权限
|
|
|
|
- List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
|
|
|
|
- if (roleKeySets.contains("province") || roleKeySets.contains("city") || roleKeySets.contains("region") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
|
|
|
|
- // 市领导可查看所有人员,不做处理
|
|
|
|
-
|
|
|
|
- } else if (roleKeySets.contains("villageTowns")) {
|
|
|
|
- // 镇领导,只能查看本镇下人员
|
|
|
|
- //获取本镇下所有乡村
|
|
|
|
- List<SysDept> allDepts = remoteDeptService.listChildrenDepts(dept.getId());
|
|
|
|
- List<String> qhList = Arrays.asList(rc.split(","));
|
|
|
|
- //取最后一级区划
|
|
|
|
- String qu = qhList.get(allDepts.size() - 1);
|
|
|
|
- boolean b = false;
|
|
|
|
- if (qu.equals(dept.getAreaName())) {
|
|
|
|
- b = true;
|
|
|
|
- } else {
|
|
|
|
- for (SysDept allDept : allDepts) {
|
|
|
|
- if (qu.equals(allDept.getAreaName())) {
|
|
|
|
- b = true;
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if (!b) {
|
|
|
|
- return AjaxResult.error("无权限查询该地区数据");
|
|
|
|
- }
|
|
|
|
- } else if (roleKeySets.contains("village")) {
|
|
|
|
- // 村领导
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
djsjqs = djsjqs.replace(" ", "%20");
|
|
djsjqs = djsjqs.replace(" ", "%20");
|
|
djsjjs = djsjjs.replace(" ", "%20");
|
|
djsjjs = djsjjs.replace(" ", "%20");
|
|
|
|
|
|
@@ -280,7 +240,9 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
|
|
|
|
|
|
//List list = new ArrayList();
|
|
//List list = new ArrayList();
|
|
List<JSONObject> list = JSON.parseArray(data, JSONObject.class);
|
|
List<JSONObject> list = JSON.parseArray(data, JSONObject.class);
|
|
-
|
|
|
|
|
|
+ for (JSONObject jsonObject : list) {
|
|
|
|
+ jsonObject.put("SFZ_ID",jsonObject.get("hi_icd"));
|
|
|
|
+ }
|
|
|
|
|
|
return AjaxResult.success("数据返回成功", list);
|
|
return AjaxResult.success("数据返回成功", list);
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|