Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -213,7 +213,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
 			lantoneProduct.setId(startAndendByUserIdVO.getProductId());
 			LantoneProduct lantone = lantoneProductFacade.getById(lantoneProduct);
 			if (lantone.getServiceStatus().equals(StatusEnum.Disable.getKey())) {
-				return RespDTO.onError("该产品已停用");
+				return RespDTO.onError("该产品线已停用");
 			}
 		}
 		//判断该用户是否有续费申请单

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -103,7 +103,7 @@
 			  and c.num=d.order_num
               and d.audit_status=1
               and a.is_deleted='N' and b.is_deleted='N' and c.is_deleted='N' and d.is_deleted='N'
-              and (find_in_set('2',a.access_type) or FIND_IN_SET('3',a.access_type))
+              -- and (find_in_set('2',a.access_type) or FIND_IN_SET('3',a.access_type))
               and b.user_id=#{userId}  and c.user_id=#{userId}  and d.user_id=#{userId}
     </select>
     

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -980,7 +980,7 @@ public class UserFacade extends UserServiceImpl {
         int auditSum = auditSums.data;
         //System.out.println("=========auditSumauditSum===="+auditSum);
         if(auditSum>0){
-   		 return RespDTO.onError("该用户产品申请单，请先审核");
+   		 return RespDTO.onError("该用户存在产品申请单，请先审核");
     	}
         List<Long> userIds = new ArrayList<>();
         userIds.add(baseIdVO.getId());