hbwri/skjcmanager.git

			@@ -594,6 +594,18 @@
			<if test="dto.buildStage != null and dto.buildStage != ''">
			and info.build_stage = #{dto.buildStage}
			</if>
			<if test="dto.selfUnit != null and dto.selfUnit.size>0 ">
			and
			<foreach collection="dto.selfUnit" item="item" index="index" open="(" separator="or" close=")">
			info.CONSTRUCTION_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
			</foreach>
			</if>
			<if test="dto.userUnit != null and dto.userUnit.size>0">
			and
			<foreach collection="dto.userUnit" item="item" index="index" open="(" separator="or" close=")">
			info.CONTROL_UNIT Like CONCAT(CONCAT('%', #{item}), '%')
			</foreach>
			</if>
			<if test="dto.sgCodeS != null and dto.sgCodeS.size > 0">
			and (dria."province_cd" in
			<foreach collection="dto.sgCodeS" item="id" separator="," open="(" close=")">

			@@ -726,7 +726,7 @@
			//判断是不是省厅建办否的话就不设置部门
			if (!roleId.equals(1800820667082948610L)){
			//判断是不是县级建办否的话就是监理单位下人员进行
			if(roleId.equals(1710904523971129345L)){
			if(roleId.equals(1800820855352672257L)){
			searchDTO.setUserUnit(longList);
			}

			@@ -121,7 +121,7 @@
			//判断是不是省厅建办否的话就不设置部门
			if (!roleId.equals(1800820667082948610L)){
			//判断是不是县级建办否的话就是监理单位下人员进行
			if(roleId.equals(1710904523971129345L)){
			if(roleId.equals(1800820855352672257L)){
			searchDTO.setUserUnit(longList);
			}

			@@ -741,6 +741,9 @@
			List<String> sgCodeS = getSgCodeByUser();
			dto.setSgCodeS(sgCodeS);
			setAdCode(dto);
			BladeUser user = AuthUtil.getUser();
			Long roleId = getRoleId();
			setUnit2(dto,user,roleId);
			List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree(dto);
			if (CollectionUtils.isNotEmpty(list)){
			list.forEach(x->{

	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml	12 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java	5 ●●●●● patch \| view \| raw \| blame \| history