ZeroLiYi hace 1 año
padre
commit
06308866f0

+ 1 - 1
src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseApplyMapper.xml

@@ -96,7 +96,7 @@
96 96
         FROM
97 97
             province_all.biz_sqr_enterprise_apply bgqa
98 98
                 LEFT JOIN province_all.biz_unit_info bui ON bgqa.unit_info_id = bui.id
99
-                LEFT JOIN province_all.biz_audit_request bgq ON bgqa.id = bgq.request_id
99
+                LEFT JOIN province_all.biz_audit_request bgq ON bgqa.id = bgq.req  uest_id
100 100
         where bgqa.apply_type=#{applyType,jdbcType=INTEGER}
101 101
 
102 102
     </select>

+ 1 - 1
src/main/java/com/chinaitop/depot/system/controller/UnitInfoController.java

@@ -55,7 +55,7 @@ public class UnitInfoController {
55 55
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
56 56
             @ApiImplicitParam(name = "unitInfoId", value = "当前用户的单位信息", paramType = "query")
57 57
     })
58
-    public PageInfo<BizUnitInfo> getList(Integer pageNum, Integer pageSize, String unitInfoId ,HttpServletRequest request, BizUnitInfo unitInfo) throws Exception {
58
+    public PageInfo<BizUnitInfo> getList(Integer pageNum, Integer pageSize, String unitInfoId ,HttpServletRequest request, BizUnitInfo unitInfo) {
59 59
 
60 60
         List<BizUnitInfo> list = unitInfoService.queryByExample(pageNum, pageSize, unitInfoId, unitInfo);
61 61
         PageInfo<BizUnitInfo> pageInfo = new PageInfo<BizUnitInfo>(list);

+ 2 - 2
src/main/java/com/chinaitop/depot/system/mapper/BizUnitInfoMapper.xml

@@ -111,12 +111,12 @@
111 111
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.BizUnitInfoExample" >
112 112
     select
113 113
     <if test="distinct" >
114
-      ,dict.DICT_LABEL
115 114
       distinct
116 115
     </if>
117 116
     <include refid="Base_Column_List" />
117
+      ,dict.DICT_LABEL
118 118
     from province_all.biz_unit_info bui
119
-    left  join  LEFT JOIN province_all.dev_dict dict on province_all.biz_unit_info.dwlx = dict.id
119
+    left  join  province_all.dev_dict dict on bui.dwlx = dict.id
120 120
     <if test="_parameter != null" >
121 121
       <include refid="Example_Where_Clause" />
122 122
     </if>