Ver código fonte

fix 修改招商部分问题

Administrator 4 anos atrás
pai
commit
92b35e75ec

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: prod
   # 文件上传
   servlet:
      multipart:

+ 2 - 1
ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanAreaMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectSmallNum"    column="project_small_num"    />
         <result property="projectNewNum"    column="project_new_num"    />
         <result property="remark"    column="remark"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectBmDeptPlanAreaVo">
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBmDeptPlanAreaList" parameterType="BmDeptPlanArea" resultMap="BmDeptPlanAreaResult">
-        select a.id, a.sys_dept_id, a.create_by, a.create_time, a.update_by, a.update_time, a.is_del, a.year, a.project_million_num, a.project_industry_num, a.project_one_num, a.project_two_num, a.project_thr_num, a.project_four_num, a.project_five_num, a.project_city_money, a.project_pro_num, a.project_ris_num, a.project_ser_num, a.project_pro_five_num, a.project_investment_num, a.project_integration_num, a.project_small_num, a.project_new_num, a.remark
+        select a.id, a.sys_dept_id, a.create_by, a.create_time, a.update_by, a.update_time, a.is_del, a.year, a.project_million_num, a.project_industry_num, a.project_one_num, a.project_two_num, a.project_thr_num, a.project_four_num, a.project_five_num, a.project_city_money, a.project_pro_num, a.project_ris_num, a.project_ser_num, a.project_pro_five_num, a.project_investment_num, a.project_integration_num, a.project_small_num, a.project_new_num, a.remark, d.dept_name
         from bm_dept_plan_area a
         left join sys_dept d on a.sys_dept_id = d.dept_id and a.is_del = '0'
         <where>