新增环境清单报错问题

xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java

@@ -99,10 +99,13 @@ public class XmEnvListController {
 				return ResponseHelper.failed("name-0","名称不能为空");
 			}
 			User user= LoginUtils.getCurrentUserInfo();
-			boolean inProjectGroup=xmGroupService.checkUserExistsGroup(xmEnvList.getProjectId(),user.getUserid());
-			if(!inProjectGroup){
-				return ResponseHelper.failed("no-in-project","您不在项目中【"+xmEnvList.getProjectId()+"】，不能添加环境清单");
+			if(StringUtils.hasText(xmEnvList.getProjectId())){
+				boolean inProjectGroup=xmGroupService.checkUserExistsGroup(xmEnvList.getProjectId(),user.getUserid());
+				if(!inProjectGroup){
+					return ResponseHelper.failed("no-in-project","您不在项目中【"+xmEnvList.getProjectId()+"】，不能添加环境清单");
+				}
 			}
+
 			if(!StringUtils.hasText(xmEnvList.getReadQx())){
 				return ResponseHelper.failed("readQx-0","请选中读权限");
 			}

xm-core/src/main/java/com/xm/core/service/XmGroupService.java

@@ -117,7 +117,7 @@ public class XmGroupService extends BaseService {
 	            groupVoList.add(gvo);
 	        });
 		    groupCacheService.putProjectGroups(projectId, groupVoList);
-		    if(page.getPageNum()>0||page.getPageSize()>0){
+		    if(page!=null && page.getPageNum()>0||page.getPageSize()>0){
 				PageUtils.startPage(page.getPageNum(), page.getPageSize(),page.getOrderBy());
 			}
 

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml

@@ -18,7 +18,7 @@
 		<if test="linkProductId!=null and linkProductId!=''">
 			and exists( select 1 from xm_product_project_link l where l.product_id=#{linkProductId} and l.project_id=res.project_id)
 		</if>
-		and (res.read_qx='0' or (res.create_userid=#{userid} and res.read_qx='9') or (res.branch_id=#{branchId} and res.read_qx='1') or (res.project_id=#{projectId} and res.read_qx ='0'))
+		and (res.read_qx='0' or (res.create_userid=#{userid} and res.read_qx='9') or (res.branch_id=#{branchId} and res.read_qx='1') or (res.project_id=#{projectId} and res.read_qx ='2'))
     </sql>