feats

src/main/java/com/yunzhi/marketing/borker/controller/BkFirstScreenController.java

@@ -56,12 +56,14 @@ public class BkFirstScreenController extends BaseController {
     public ResponseBean bkFirstScreenList(@ApiParam("客户端") @PathVariable String client,
                                           @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @ApiParam("城市") @RequestParam(value ="cityId", required = false) String cityId,
                                           HttpServletRequest request) throws Exception{
 
         IPage<BkFirstScreen> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<BkFirstScreen> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
         queryWrapper.eq("org_id", getOrgId(request));
+        queryWrapper.eq(!StringUtils.isEmpty(cityId), "city_id", cityId);
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
 
         if ("admin".equals(client)) {
             List<String> institutionIds = getInstitutionIds(request);
@@ -116,9 +118,11 @@ public class BkFirstScreenController extends BaseController {
      */
     @RequestMapping(value="/admin/bkFirstScreen/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean bkFirstScreenUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean bkFirstScreenUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody BkFirstScreen bkFirstScreen) throws Exception{
 
+        bkFirstScreen.setScreenId(id);
+
         if (iBkFirstScreenService.updateById(bkFirstScreen)){
             return ResponseBean.success(iBkFirstScreenService.getById(id));
         }else {

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -965,6 +965,6 @@ public class CommConstant {
     /**
      * 根机构ID
      */
-    public static final String ROOT_INSTITUTION = "01";
+    public static final String ROOT_INSTITUTION = "1"; // 原来是 01 估计是个 bug
 }