hym 4 年之前
父節點
當前提交
d031d17c07

+ 1 - 1
src/main/java/com/zoniot/ccrc/controller/system/CommunityManagerController.java

@@ -64,7 +64,7 @@ public class CommunityManagerController {
 
 	@GetMapping("getCommunityPage")
 	@ApiOperation(value = "获取小区列表分页", notes = "权限:sys:community:query")
-	@PreAuthorize("hasAuthority('sys:community:query')")
+
 	public AjaxMessage<Pagination<CommunityDto>> getCommunityPage(
 			@ApiParam(value = "小区名称", required = false) @RequestParam(required = false) String communityName,
 			@ApiParam(value = "省", required = false) @RequestParam(required = false) Integer province,

+ 1 - 1
src/main/java/com/zoniot/ccrc/controller/system/SiteController.java

@@ -121,7 +121,7 @@ public class SiteController {
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
     @GetMapping("getCustomerList")
-    @ApiOperation(value = "获取客户编号么")
+    @ApiOperation(value = "获取客户列表")
     public AjaxMessage<List<Customer>> getCustomerList(
 
     ) {

+ 2 - 0
src/main/java/com/zoniot/ccrc/dto/CommunityDto.java

@@ -21,5 +21,7 @@ public class CommunityDto extends Community {
 
     @ApiModelProperty(value = "片区区", position = 4)
     private String districtName;
+    @ApiModelProperty(value = "机构名称", position = 5)
+    private String OrgName;
 
 }

+ 5 - 3
src/main/resources/mapper/CommunityMapper.xml

@@ -401,14 +401,16 @@
         select <include refid="General_Column_List"></include>,
         sa1.name as province_name,
         sa2.name as city_name,
-        sa3.name as region_name
+        sa3.name as region_name,
+        so.name OrgName
         from sc_community sc
         left join sc_area sa1 on sa1.id = sc.province
         left join sc_area sa2 on sa2.id = sc.city
         left join sc_area sa3 on sa3.id = sc.region
+        left join sc_organization so on sc.org_id=so.id
         where sc.status = 1
-        <if test="siteId != null"> and site_id = #{siteId} </if>
-        <if test="customerId != null"> and customer_id = #{customerId} </if>
+        <if test="siteId != null"> and sc.site_id = #{siteId} </if>
+        <if test="customerId != null"> and sc.customer_id = #{customerId} </if>
         <if test="communityName != null and communityName != ''"> and sc.name like concat('%',#{communityName} ,'%')</if>
         <if test="province != null"> and sc.province = #{province}</if>
         <if test="city != null"> and sc.city = #{city}</if>