bug fix

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

@@ -272,14 +272,23 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
     public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        @RequestParam(value = "personId") String personId,
+                                                        @RequestParam(value = "personId", required = false) String personId,
+                                                        @RequestParam(value = "userId", required = false) Integer userId,
                                                         @RequestParam(value = "targetId") String targetId,
                                                         @RequestParam(value = "eventType") String eventType,
                                                         HttpServletRequest request) {
         try {
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            if (userId == null){
+                taPersonQueryWrapper.eq("person_id", personId);
+            }
+            if (personId == null){
+                taPersonQueryWrapper.eq("user_id", userId);
+            }
+            TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, personId, getOrgId(request), targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, taPerson.getPersonId(), getOrgId(request), targetId, eventType);
             return ResponseBean.success(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -300,18 +309,24 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
     public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam(value = "personId") String personId,
+                                               @RequestParam(value = "personId", required = false) String personId,
+                                               @RequestParam(value = "userId", required = false) Integer userId,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        if (personId == null) {
+        if (personId == null && userId == null) {
             return responseBean;
         }
         //使用分页插件
         IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
         QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-        taPersonQueryWrapper.eq("person_id", personId);
+        if (userId == null){
+            taPersonQueryWrapper.eq("person_id", personId);
+        }
+        if (personId == null){
+            taPersonQueryWrapper.eq("user_id", userId);
+        }
         TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
-        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, personId);
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e -> {

src/main/java/com/huiju/estateagents/sample/controller/TaH5DemandController.java

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 /**
  * <p>
@@ -28,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020-03-18
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaH5DemandController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaH5DemandController.class);
@@ -43,14 +45,16 @@ public class TaH5DemandController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taH5Demand",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taH5Demand",method= RequestMethod.GET)
     public ResponseBean taH5DemandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaH5Demand> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaH5Demand> result = iTaH5DemandService.page(pg, queryWrapper);
@@ -68,7 +72,7 @@ public class TaH5DemandController extends BaseController {
      * @param taH5Demand 实体对象
      * @return
      */
-    @RequestMapping(value="/taH5Demand",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taH5Demand",method= RequestMethod.POST)
     public ResponseBean taH5DemandAdd(@RequestBody TaH5Demand taH5Demand){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -135,7 +139,7 @@ public class TaH5DemandController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taH5Demand/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taH5Demand/{id}",method= RequestMethod.GET)
     public ResponseBean taH5DemandGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {