1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/ProductManagementServiceImpl.java

@@ -59,6 +59,7 @@ public class ProductManagementServiceImpl implements IProductManagementService{
 	@Override
 	public Page<ProductManagement> list(Long commonId,String mainBody,String shopNames,String coverImage,String province,String city,String area,String location,String detailedAddress,String serviceDescription,String nickname,String phone,String realname,String personNo,String personImageFront,String personImageBack,String businessLicense,String status,String userLongitude,String userLatitude,String place,String myFlag,String searchKeyWord,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<ProductManagement> wrapper = new EntityWrapper<ProductManagement>();
+		wrapper.eq("delete_flag", 0);
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
 				}
@@ -123,7 +124,6 @@ public class ProductManagementServiceImpl implements IProductManagementService{
 					wrapper.andNew().like("shop_names", searchKeyWord).or()
 							.like("service_description", searchKeyWord);
 				}
-					wrapper.eq("delete_flag", 0);
 		List<ProductManagement> list = productManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		if (!"1".equals(myFlag)) {
 			if (!CollectionUtils.isEmpty(list)) {