Merge branch 'dev_issue_category' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@@ -393,7 +393,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setCustomerId(formDTO.getCustomerId());
         entity.setPid(formDTO.getParentCategoryId());
         entity.setPids(formDTO.getParentCategoryId());
-        IssueProjectCategoryDictEntity parentCategoryCode = baseDao.selectById(formDTO.getParentCategoryId());
+        IssueProjectCategoryDictDTO parentCategoryCode = baseDao.selectByCustomerId(formDTO.getCustomerId(),formDTO.getParentCategoryId());
         entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
         // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -211,6 +211,6 @@
         <if test="pid != null and pid != 0">
             AND d.PID != '0'
         </if>
-        ORDER BY CATEGORY_CODE ASC
+        ORDER BY SORT, CATEGORY_CODE ASC
     </select>
 </mapper>