Explorar o código

客户端接口补充

huangjn %!s(int64=3) %!d(string=hai) anos
pai
achega
cf08d0a128

+ 2 - 2
blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -72,7 +72,7 @@
             query.create_time,
             query.task_status,
             query.report_number,
-            query.file_user_name
+            query.file_user_id_and_name
         from
         (
             select
@@ -82,7 +82,7 @@
                 create_time,
                 task_status,
                 report_number,
-                file_user_name,
+                file_user_id_and_name,
                 date_format(create_time,'%Y-%m-%d') as createTimes
             from u_information_query
             where

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -80,6 +80,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
             result.forEach(node -> {
                 //转换
                 WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();
+                vos.setDeptCategory(node.getDeptCategory());
                 vos.setPrimaryKeyId(String.valueOf(node.getPKeyId()));
                 vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName());
                 //最终返回集合

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -170,7 +170,8 @@
         select
             p_key_id,
             dept_name,
-            full_name
+            full_name,
+            dept_category
         from
           m_wbs_tree_contract
         where