魏超 5 yıl önce
ebeveyn
işleme
ced8b17e66

+ 4
- 1
src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java Dosyayı Görüntüle

20
 import org.springframework.beans.factory.annotation.Autowired;
20
 import org.springframework.beans.factory.annotation.Autowired;
21
 import org.springframework.web.bind.annotation.*;
21
 import org.springframework.web.bind.annotation.*;
22
 
22
 
23
+import javax.servlet.http.HttpServletRequest;
23
 import java.time.LocalDateTime;
24
 import java.time.LocalDateTime;
24
 import java.util.Arrays;
25
 import java.util.Arrays;
25
 import java.util.List;
26
 import java.util.List;
183
      * @param id 实体ID
184
      * @param id 实体ID
184
      */
185
      */
185
     @RequestMapping(value = "/admin/taH5Sample/{id}", method = RequestMethod.GET)
186
     @RequestMapping(value = "/admin/taH5Sample/{id}", method = RequestMethod.GET)
186
-    public ResponseBean taH5SampleGet(@PathVariable Integer id) {
187
+    public ResponseBean taH5SampleGet(@PathVariable Integer id, HttpServletRequest request) {
187
         ResponseBean responseBean = new ResponseBean();
188
         ResponseBean responseBean = new ResponseBean();
188
         try {
189
         try {
189
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
190
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
190
             QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
191
             QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
191
             queryWrapper.eq("sample_id", id);
192
             queryWrapper.eq("sample_id", id);
193
+            queryWrapper.ne("demand_status", CommConstant.STATUS_DELETE);
194
+            queryWrapper.eq("org_id", getOrgId(request));
192
             Integer demandNum = iTaH5DemandService.count(queryWrapper);
195
             Integer demandNum = iTaH5DemandService.count(queryWrapper);
193
             IPage<TaContact> taContactIPage = taContactService.taContactInfoBySampleId(String.valueOf(id), 1 , 10);
196
             IPage<TaContact> taContactIPage = taContactService.taContactInfoBySampleId(String.valueOf(id), 1 , 10);
194
             taH5Sample.setTaContactList(taContactIPage.getRecords());
197
             taH5Sample.setTaContactList(taContactIPage.getRecords());