项目

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -184,7 +184,10 @@ public class TaUserController extends BaseController {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
         taUser.setLoginPassword("");
-        String token = JWTUtils.newToken(taUser.getUserId().toString());
+        Map map = new HashMap();
+        map.put("userId",taUser.getUserId().toString());
+        map.put("orgId",taUser.getOrgId().toString());
+        String token = JWTUtils.newTokenByMap(map);
     
         //保存token
         saveToken(token);

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -74,9 +74,10 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String name,
                                              @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
+                                             @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
 
     /**
      * 详情

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
 
     /**
      * 项目详情

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -30,6 +30,9 @@
         <if test="cityId != 0 and cityId != null">
             and city_id = #{cityId}
         </if>
+        <if test="title != null and title != ''">
+            and title = #{title}
+        </if>
         <if test="time != null">
             and TO_DAYS(create_date) = TO_DAYS(#{time})
         </if>