feats

src/main/java/com/yunzhi/marketing/base/BaseController.java

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.JWTUtils;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
         TaUser taUser = taUserService.getById(getUserId(request));
         List<Institution> list = iInstitutionService.getAllByUser(taUser);
         List<String> institutions = list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
-        if (institutions.contains("01")) {
+        if (institutions.contains(CommConstant.ROOT_INSTITUTION)) {
             return null;
         }
         return institutions;

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

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.yunzhi.marketing.borker.entity.BkAgreement;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 佣金规则 前端控制器
 
 @Api(tags = "佣金规则")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class BkAgreementController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(BkAgreementController.class);
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/bkAgreement",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/bkAgreement",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkAgreementList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean bkAgreementList(@ApiParam("客户端") @PathVariable String client,
+                                        @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        HttpServletRequest request) throws Exception{
 
-		    IPage<BkAgreement> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<BkAgreement> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<BkAgreement> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<BkAgreement> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", getOrgId(request));
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<BkAgreement> result = iBkAgreementService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<BkAgreement> result = iBkAgreementService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
      * @param bkAgreement 实体对象
      * @return
      */
-    @RequestMapping(value="/bkAgreement",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/bkAgreement",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean bkAgreementAdd(@ApiParam("保存内容") @RequestBody BkAgreement bkAgreement) throws Exception{
+    public ResponseBean bkAgreementAdd(@ApiParam("保存内容") @RequestBody BkAgreement bkAgreement,
+                                       HttpServletRequest request) throws Exception {
+
+        bkAgreement.setOrgId(getOrgId(request).toString());
+        bkAgreement.setInstitutionId(CommConstant.ROOT_INSTITUTION);
 
         if (iBkAgreementService.save(bkAgreement)){
             return ResponseBean.success(bkAgreement);
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkAgreement/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/bkAgreement/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean bkAgreementDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean bkAgreementDelete(@ApiParam("对象ID") @PathVariable String id,
+                                          HttpServletRequest request) throws Exception{
+
+        BkAgreement bkAgreement = iBkAgreementService.getById(id);
+        if (null == bkAgreement || CommConstant.STATUS_DELETE.equals(bkAgreement)) {
+            return ResponseBean.success("success");
+        }
+
+        if (!bkAgreement.getOrgId().equals(getOrgId(request))) {
+            return ResponseBean.error("暂无权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         if(iBkAgreementService.removeById(id)){
             return ResponseBean.success("success");
         }else {
      * @param bkAgreement 实体对象
      * @return
      */
-    @RequestMapping(value="/bkAgreement/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/bkAgreement/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean bkAgreementUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody BkAgreement bkAgreement) throws Exception{
+    public ResponseBean bkAgreementUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                          @ApiParam("更新内容") @RequestBody BkAgreement bkAgreement,
+                                          HttpServletRequest request) throws Exception{
+
+
+        BkAgreement origin = iBkAgreementService.getById(id);
+        if (null == bkAgreement || CommConstant.STATUS_DELETE.equals(bkAgreement)) {
+            return ResponseBean.success("success");
+        }
+
+        if (!bkAgreement.getOrgId().equals(getOrgId(request))) {
+            return ResponseBean.error("暂无权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        bkAgreement.setOrgId(origin.getOrgId());
 
         if (iBkAgreementService.updateById(bkAgreement)){
             return ResponseBean.success(iBkAgreementService.getById(id));
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkAgreement/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/bkAgreement/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkAgreementGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean bkAgreementGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iBkAgreementService.getById(id));
     }
 }

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

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.yunzhi.marketing.borker.entity.BkBankCard;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 经纪人银行卡信息 前端控制器
 
 @Api(tags = "经纪人银行卡信息")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class BkBankCardController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(BkBankCardController.class);
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/bkBankCard",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/bkBankCard",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean bkBankCardList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       HttpServletRequest request) throws Exception {
+
+        String personId = getPersonId(request);
 
-		    IPage<BkBankCard> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<BkBankCard> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<BkBankCard> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<BkBankCard> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<BkBankCard> result = iBkBankCardService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<BkBankCard> result = iBkBankCardService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
      * @param bkBankCard 实体对象
      * @return
      */
-    @RequestMapping(value="/bkBankCard",method= RequestMethod.POST)
+    @RequestMapping(value="/wx/bkBankCard",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean bkBankCardAdd(@ApiParam("保存内容") @RequestBody BkBankCard bkBankCard) throws Exception{
+    public ResponseBean bkBankCardAdd(@ApiParam("保存内容") @RequestBody BkBankCard bkBankCard,
+                                      HttpServletRequest request) throws Exception {
+        String personId = getPersonId(request);
+        bkBankCard.setPersonId(personId);
 
         if (iBkBankCardService.save(bkBankCard)){
             return ResponseBean.success(bkBankCard);
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkBankCard/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/wx/bkBankCard/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean bkBankCardDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean bkBankCardDelete(@ApiParam("对象ID") @PathVariable Integer id,
+                                         HttpServletRequest request) throws Exception {
+        String personId = getPersonId(request);
+        BkBankCard bkBankCard = iBkBankCardService.getById(id);
+        if (null != bkBankCard && !personId.equals(bkBankCard.getPersonId())) {
+            return ResponseBean.error("操作异常", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         if(iBkBankCardService.removeById(id)){
             return ResponseBean.success("success");
         }else {
      * @param bkBankCard 实体对象
      * @return
      */
-    @RequestMapping(value="/bkBankCard/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/bkBankCard/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean bkBankCardUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody BkBankCard bkBankCard) throws Exception{
+                                         @ApiParam("更新内容") @RequestBody BkBankCard bkBankCard,
+                                         HttpServletRequest request) throws Exception {
+        String personId = getPersonId(request);
+        BkBankCard origin = iBkBankCardService.getById(id);
+        if (null == origin || CommConstant.STATUS_DELETE.equals(origin.getStatus()) || !personId.equals(origin.getPersonId())) {
+            return ResponseBean.error("未找到数据", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        bkBankCard.setPersonId(personId);
 
         if (iBkBankCardService.updateById(bkBankCard)){
             return ResponseBean.success(iBkBankCardService.getById(id));
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkBankCard/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/bkBankCard/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkBankCardGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iBkBankCardService.getById(id));
+    public ResponseBean bkBankCardGet(@ApiParam("对象ID") @PathVariable Integer id,
+                                      HttpServletRequest request) throws Exception{
+        String personId = getPersonId(request);
+        BkBankCard origin = iBkBankCardService.getById(id);
+        if (null == origin || CommConstant.STATUS_DELETE.equals(origin.getStatus()) || !personId.equals(origin.getPersonId())) {
+            return ResponseBean.error("未找到数据", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        return ResponseBean.success(origin);
     }
 }

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

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.yunzhi.marketing.borker.entity.BkFirstScreen;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 经纪人首屏广告 前端控制器
 
 @Api(tags = "经纪人首屏广告")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class BkFirstScreenController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(BkFirstScreenController.class);
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/bkFirstScreen",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/bkFirstScreen",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkFirstScreenList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean bkFirstScreenList(@ApiParam("客户端") @PathVariable String client,
+                                          @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          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));
 
-		    IPage<BkFirstScreen> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<BkFirstScreen> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        if ("admin".equals(client)) {
+            List<String> institutionIds = getInstitutionIds(request);
+            queryWrapper.in(null != institutionIds, "institution_id", institutionIds);
+        }
 
-            IPage<BkFirstScreen> result = iBkFirstScreenService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<BkFirstScreen> result = iBkFirstScreenService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
      * @param bkFirstScreen 实体对象
      * @return
      */
-    @RequestMapping(value="/bkFirstScreen",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/bkFirstScreen",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean bkFirstScreenAdd(@ApiParam("保存内容") @RequestBody BkFirstScreen bkFirstScreen) throws Exception{
+    public ResponseBean bkFirstScreenAdd(@ApiParam("保存内容") @RequestBody BkFirstScreen bkFirstScreen,
+                                         HttpServletRequest request) throws Exception{
+
+        bkFirstScreen.setInstitutionId(CommConstant.ROOT_INSTITUTION);
+        bkFirstScreen.setOrgId(getOrgId(request).toString());
 
         if (iBkFirstScreenService.save(bkFirstScreen)){
             return ResponseBean.success(bkFirstScreen);
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkFirstScreen/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/bkFirstScreen/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean bkFirstScreenDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean bkFirstScreenDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iBkFirstScreenService.removeById(id)){
             return ResponseBean.success("success");
         }else {
      * @param bkFirstScreen 实体对象
      * @return
      */
-    @RequestMapping(value="/bkFirstScreen/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/bkFirstScreen/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean bkFirstScreenUpdate(@ApiParam("对象ID") @PathVariable Integer id,
                                         @ApiParam("更新内容") @RequestBody BkFirstScreen bkFirstScreen) throws Exception{
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkFirstScreen/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/bkFirstScreen/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkFirstScreenGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean bkFirstScreenGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iBkFirstScreenService.getById(id));
     }
 }

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

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.yunzhi.marketing.borker.entity.BkNotice;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 通知公告 前端控制器
 
 @Api(tags = "通知公告")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class BkNoticeController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(BkNoticeController.class);
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/bkNotice",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/bkNotice",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkNoticeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<BkNotice> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<BkNotice> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+    public ResponseBean bkNoticeList(@ApiParam("客户端") @PathVariable String client,
+                                     @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     HttpServletRequest request) throws Exception{
 
-            IPage<BkNotice> result = iBkNoticeService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+        IPage<BkNotice> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<BkNotice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
 
-    /**
-     * 保存对象
-     * @param bkNotice 实体对象
-     * @return
-     */
-    @RequestMapping(value="/bkNotice",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean bkNoticeAdd(@ApiParam("保存内容") @RequestBody BkNotice bkNotice) throws Exception{
-
-        if (iBkNoticeService.save(bkNotice)){
-            return ResponseBean.success(bkNotice);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/bkNotice/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean bkNoticeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iBkNoticeService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if ("admin".equals(client)) {
+            List<String> institutionIds = getInstitutionIds(request);
+            queryWrapper.in(null != institutionIds, "institution_id", institutionIds);
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param bkNotice 实体对象
-     * @return
-     */
-    @RequestMapping(value="/bkNotice/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean bkNoticeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody BkNotice bkNotice) throws Exception{
+        queryWrapper.orderByDesc("create_date");
 
-        if (iBkNoticeService.updateById(bkNotice)){
-            return ResponseBean.success(iBkNoticeService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+        IPage<BkNotice> result = iBkNoticeService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
+//    /**
+//     * 保存对象
+//     * @param bkNotice 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/bkNotice",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean bkNoticeAdd(@ApiParam("保存内容") @RequestBody BkNotice bkNotice) throws Exception{
+//
+//        if (iBkNoticeService.save(bkNotice)){
+//            return ResponseBean.success(bkNotice);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/bkNotice/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean bkNoticeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iBkNoticeService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param bkNotice 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/bkNotice/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean bkNoticeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody BkNotice bkNotice) throws Exception{
+//
+//        if (iBkNoticeService.updateById(bkNotice)){
+//            return ResponseBean.success(iBkNoticeService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/bkNotice/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/bkNotice/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean bkNoticeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iBkNoticeService.getById(id));
+    public ResponseBean bkNoticeGet(@ApiParam("客户端") @PathVariable String client,
+                                    @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        BkNotice bkNotice = iBkNoticeService.getById(id);
+        if (null == bkNotice || CommConstant.STATUS_DELETE.equals(bkNotice.getStatus())) {
+            return ResponseBean.error("未找到数据", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(bkNotice);
     }
 }

src/main/java/com/yunzhi/marketing/borker/entity/BkAgreement.java

     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "规则ID")
-    @TableId(value = "rule_id", type = IdType.INPUT)
+    @TableId(value = "rule_id", type = IdType.UUID)
     private String ruleId;
 
     @ApiModelProperty(value = "规则内容")

src/main/java/com/yunzhi/marketing/borker/entity/BkFirstScreen.java

     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
-    @TableId(value = "screen_id", type = IdType.INPUT)
+    @TableId(value = "screen_id", type = IdType.UUID)
     private String screenId;
 
     @ApiModelProperty(value = "显示类型")

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

      */
     public static final String CHANNEL_CUSTOMER_AGREE = "2";
     public static final String CHANNEL_CUSTOMER_DISAGREE = "3";
+
+    /**
+     * 根机构ID
+     */
+    public static final String ROOT_INSTITUTION = "01";
 }
+

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

     public String getInstitutionId(String buildingId) {
         TaBuilding building = taBuildingMapper.selectById(buildingId);
         if (null == building){
-            return "01";
+            return CommConstant.ROOT_INSTITUTION;
         }
         return building.getInstitutionId();
     }