Merge branch 'chenhao' into 'developer'

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

 package com.yeejoin.amos.boot.biz.common.controller;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,11 +21,12 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -28,10 +35,10 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-
 /**
  * 数据字典
  *
@@ -43,232 +50,235 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value = "/data-dictionary")
 public class DataDictionaryController extends BaseController {
 
-    @Autowired
-    DataDictionaryServiceImpl iDataDictionaryService;
-    @Autowired
-    RedisUtils redisUtils;
-
-    @Value("${redis.cache.failure.time}")
-    private long time;
+	@Autowired
+	DataDictionaryServiceImpl iDataDictionaryService;
+	@Autowired
+	RedisUtils redisUtils;
 
-    /**
-     * 新增数据字典
-     *
-     * @return
-     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典")
-    public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary) {
-        return iDataDictionaryService.save(dataDictionary);
-    }
+	@Value("${redis.cache.failure.time}")
+	private long time;
+	
+	@Autowired
+	DataDictionaryMapper dataDictionaryMapper;
 
-    /**
-     * 根据id删除
-     *
-     * @param id
-     * @return
-     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
-        return iDataDictionaryService.removeById(id);
-    }
+	/**
+	 * 新增数据字典
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/save", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典")
+	public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary) {
+		return iDataDictionaryService.save(dataDictionary);
+	}
 
+	/**
+	 * 根据id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+	public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
+		return iDataDictionaryService.removeById(id);
+	}
 
-    /**
-     * 修改数据字典
-     *
-     * @return
-     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
-    @ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典")
-    public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary) {
-        return iDataDictionaryService.updateById(dataDictionary);
-    }
+	/**
+	 * 修改数据字典
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+	@ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典")
+	public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary) {
+		return iDataDictionaryService.updateById(dataDictionary);
+	}
 
+	/**
+	 * 根据id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+	public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id) {
+		return iDataDictionaryService.getById(id);
+	}
 
-    /**
-     * 根据id查询
-     *
-     * @param id
-     * @return
-     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id) {
-        return iDataDictionaryService.getById(id);
-    }
+	/**
+	 * 列表分页查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+	public IPage<DataDictionary> listPage(String pageNum, String pageSize, DataDictionary dataDictionary) {
 
+		Page<DataDictionary> pageBean;
+		QueryWrapper<DataDictionary> dataDictionaryQueryWrapper = new QueryWrapper<>();
+		Class<? extends DataDictionary> aClass = dataDictionary.getClass();
+		Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+			try {
+				field.setAccessible(true);
+				Object o = field.get(dataDictionary);
+				if (o != null) {
+					Class<?> type = field.getType();
+					String name = NameUtils.camel2Underline(field.getName());
+					if (type.equals(Integer.class)) {
+						Integer fileValue = (Integer) field.get(dataDictionary);
+						dataDictionaryQueryWrapper.eq(name, fileValue);
+					} else if (type.equals(Long.class)) {
+						Long fileValue = (Long) field.get(dataDictionary);
+						dataDictionaryQueryWrapper.eq(name, fileValue);
+					} else if (type.equals(String.class)) {
+						String fileValue = (String) field.get(dataDictionary);
+						dataDictionaryQueryWrapper.eq(name, fileValue);
+					} else {
+						String fileValue = (String) field.get(dataDictionary);
+						dataDictionaryQueryWrapper.eq(name, fileValue);
+					}
+				}
+			} catch (Exception e) {
+				throw new RuntimeException("系统异常");
+			}
+		});
+		IPage<DataDictionary> page;
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		page = iDataDictionaryService.page(pageBean, dataDictionaryQueryWrapper);
+		return page;
+	}
 
-    /**
-     * 列表分页查询
-     *
-     * @return
-     */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<DataDictionary> listPage(String pageNum, String pageSize, DataDictionary dataDictionary) {
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+	public ResponseModel<Object> gwmcDataDictionary(@PathVariable String type) throws Exception {
 
-        Page<DataDictionary> pageBean;
-        QueryWrapper<DataDictionary> dataDictionaryQueryWrapper = new QueryWrapper<>();
-        Class<? extends DataDictionary> aClass = dataDictionary.getClass();
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-            try {
-                field.setAccessible(true);
-                Object o = field.get(dataDictionary);
-                if (o != null) {
-                    Class<?> type = field.getType();
-                    String name = NameUtils.camel2Underline(field.getName());
-                    if (type.equals(Integer.class)) {
-                        Integer fileValue = (Integer) field.get(dataDictionary);
-                        dataDictionaryQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Long.class)) {
-                        Long fileValue = (Long) field.get(dataDictionary);
-                        dataDictionaryQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(String.class)) {
-                        String fileValue = (String) field.get(dataDictionary);
-                        dataDictionaryQueryWrapper.eq(name, fileValue);
-                    } else {
-                        String fileValue = (String) field.get(dataDictionary);
-                        dataDictionaryQueryWrapper.eq(name, fileValue);
-                    }
-                }
-            } catch (Exception e) {
-                throw new RuntimeException("系统异常");
-            }
-        });
-        IPage<DataDictionary> page;
-        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
-        } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        }
-        page = iDataDictionaryService.page(pageBean, dataDictionaryQueryWrapper);
-        return page;
-    }
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
 
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
-    public ResponseModel<Object> gwmcDataDictionary(@PathVariable String type) throws Exception {
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+					"getParent", null);
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
 
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/dataDictionary", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典2", notes = "根据字典类型查询字典2")
+	public ResponseModel<Object> getDictionary(@RequestParam String type) throws Exception {
 
-        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
-            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
-            return ResponseHelper.buildResponse(obj);
-        } else {
-            Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-            List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                    , "getParent", null);
-            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
-            return ResponseHelper.buildResponse(menus);
-        }
-    }
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
 
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/dataDictionary", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典2", notes = "根据字典类型查询字典2")
-    public ResponseModel<Object> getDictionary(@RequestParam String type) throws Exception {
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+					"getParent", null);
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
 
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
+	public ResponseModel<Object> gwmcDataDictionaryFireChemical(@PathVariable String type) throws Exception {
 
-        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
-            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
-            return ResponseHelper.buildResponse(obj);
-        } else {
-            Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-            List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                    , "getParent", null);
-            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
-            return ResponseHelper.buildResponse(menus);
-        }
-    }
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
 
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
-    public ResponseModel<Object> gwmcDataDictionaryFireChemical(@PathVariable String type) throws Exception {
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<MenuFrom> menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0,
+					"getName", "getParent", null);
+			MenuFrom Me = new MenuFrom("-1", "-1", "-1", "危化品库", "危化品库", "危化品库", "-1", null);
+			Me.setIsLeaf(false);
+			Me.setChildren(menus);
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(Me), time);
+			return ResponseHelper.buildResponse(Me);
+		}
+	}
 
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/form/list", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据表态类型多个code查询表单数据项", notes = "根据表态类型多个code查询表单数据项")
+	public ResponseModel<Object> selectFormdListItem(HttpServletRequest request, String types) {
+		HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
+		try {
+			String[] typest = types.split(",");
+			for (String type : typest) {
+				QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+				queryWrapper.eq("type", type);
+				queryWrapper.orderByAsc("sort_num");
+				if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE_XIN + type)) {
+					Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE_XIN + type);
+					objectObjectHashMap.put(type, obj);
+				} else {
+					Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+					List<MenuFrom> menus = null;
+					menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+							"getParent", null);
+					redisUtils.set(RedisKey.DATA_DICTIONARY_CODE_XIN + type, JSON.toJSON(menus), time);
+					objectObjectHashMap.put(type, menus);
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException("系统异常！");
+		}
+		return ResponseHelper.buildResponse(objectObjectHashMap);
+	}
 
-        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
-            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
-            return ResponseHelper.buildResponse(obj);
-        } else {
-            Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-            List<MenuFrom> menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0,
-                    "getName", "getParent", null);
-            MenuFrom Me = new MenuFrom("-1", "-1", "-1", "危化品库", "危化品库", "危化品库", "-1", null);
-            Me.setIsLeaf(false);
-            Me.setChildren(menus);
-            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(Me), time);
-            return ResponseHelper.buildResponse(Me);
-        }
-    }
-
-
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/form/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据表态类型多个code查询表单数据项", notes = "根据表态类型多个code查询表单数据项")
-    public ResponseModel<Object> selectFormdListItem(HttpServletRequest request, String types) {
-        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
-        try {
-            String[] typest = types.split(",");
-            for (String type : typest) {
-                QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("type", type);
-                queryWrapper.orderByAsc("sort_num");
-                if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE_XIN + type)) {
-                    Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE_XIN + type);
-                    objectObjectHashMap.put(type, obj);
-                } else {
-                    Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-                    List<MenuFrom> menus = null;
-                    menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-                            "getParent", null);
-                    redisUtils.set(RedisKey.DATA_DICTIONARY_CODE_XIN + type, JSON.toJSON(menus), time);
-                    objectObjectHashMap.put(type, menus);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("系统异常！");
-        }
-        return ResponseHelper.buildResponse(objectObjectHashMap);
-    }
-
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/dataDictionaryTree", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典树", notes = "根据字典类型查询字典树")
-    public ResponseModel<Object> getDictionaryTree(@RequestParam String type, @RequestParam String rootName) throws Exception {
-
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
-
-        Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-        List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                , "getParent", null);
-        // 创建根节点
-        Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
-        List<Menu> menuList = new ArrayList<>();
-        // 挂在主节点
-        menuList.add(menu);
-        return ResponseHelper.buildResponse(menuList);
-    }
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/dataDictionaryTree", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典树", notes = "根据字典类型查询字典树")
+	public ResponseModel<Object> getDictionaryTree(@RequestParam String type, @RequestParam String rootName)
+			throws Exception {
 
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+		Collection<DataDictionary> list = null;
+		if ("YJLDDW".equals(type)) {
+			list =	dataDictionaryMapper.getNoInLinkUnit();
+		} else {
+			list = iDataDictionaryService.list(queryWrapper);
+			
+		}
+		List<Menu> menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
+				null);
+		// 创建根节点
+		Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
+		List<Menu> menuList = new ArrayList<>();
+		// 挂在主节点
+		menuList.add(menu);
+		return ResponseHelper.buildResponse(menuList);
+	}
 
 }
-

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

@@ -17,4 +17,9 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
 	 * @return
 	 */
    public List<DataDictionary>  getDataDictionaryListAndCount();
+   /**
+    * 获取包含联动单位的联动单位树信息
+    * @return
+    */
+   public List<DataDictionary>  getNoInLinkUnit();
 }

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -23,4 +23,26 @@ GROUP BY
 
 
 </select>
+
+
+
+
+<select id ="getNoInLinkUnit" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+SELECT
+	cbb.*
+FROM
+	cb_data_dictionary cbb
+LEFT JOIN (
+	SELECT
+		emergency_linkage_unit_code,
+		COUNT(1) count
+	FROM
+		cb_linkage_unit
+	GROUP BY
+		emergency_linkage_unit_code
+) elink ON elink.emergency_linkage_unit_code = cbb.`code`
+WHERE
+	cbb.type = 'YJLDDW'
+AND elink.count IS NOT NULL
+</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CompanyDto.java

@@ -38,4 +38,7 @@ public class CompanyDto {
 
     @ApiModelProperty(value = "单位名称")
     private String name;
+    
+    @ApiModelProperty(value = "重点部位数量")
+    private int keySiteNum;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -220,8 +220,12 @@
         a.companyMaleEmployees,
         a.companyFemaleEmployees,
         a.managementType,
-        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
-        FROM important_companys a
+        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance,
+        case when cks_d.count is null then  0 else cks_d.count end as keySiteNum
+        FROM important_companys a left join (
+           SELECT cks.belong_id ,count(cks.belong_id) count from cb_key_site cks GROUP BY cks.belong_id
+        )cks_d
+ 		on a.id=cks_d.belong_id
         where  a.longitude is not null and a.latitude is not null
         <if test='par.distance!=null'>
             and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -359,6 +359,12 @@ public class MaintenanceCompanyServiceImpl
 				filedParamsMap.put("status", paramsMap.get("status").toString());
 			}
 			mainTableList = this.checkMaintenanceCompanyList(wrapper, paramsMap);
+			/*BUG 2503  人员头像存在附件中，获取附件信息返回前端  start*/
+			for (MaintenanceCompany m:mainTableList
+				 ) {
+				m.setAttachments(sourceFileService.getAttachments(m.getSequenceNbr()));
+			}
+			/* *BUG 2503 end*/
 			List<Long> instanceIds = Lists.transform(mainTableList, MaintenanceCompany::getInstanceId);
 			filedParamsMap.put("instanceIds", Joiner.on(",").join(instanceIds));
 			break;
@@ -388,6 +394,7 @@ public class MaintenanceCompanyServiceImpl
 			if (!ObjectUtils.isEmpty(detail)) {
 				r.putAll(Bean.BeantoMap(detail));
 			}
+
 		});
 		return page;
 	}

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -154,5 +154,11 @@
 			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 		</sql>
 	</changeSet>
-
+	<changeSet author="chenhao" id="2021-08-31-chenhao-1">
+		
+		<comment>modify table cb_firefighters_thought add one columns</comment>
+		<sql>
+			ALTER TABLE `cb_firefighters_thought` modify talking_time datetime COMMENT '谈话时间';
+		</sql>
+	</changeSet>
 </databaseChangeLog>