skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
@@ -163,6 +163,9 @@ private String selfUnit; @TableField(exist = false) private String countyUnit; @TableField(exist = false) private String countyCd; @TableField(exist = false) skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -56,6 +56,11 @@ private Long userUnit; /** * 县单位位 */ private Long countryUnit; /** * 用户角色 */ private Long roleUnit; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -99,6 +99,9 @@ <if test="dto.userUnit != null and dto.userUnit != ''"> and si.CONTROL_UNIT=#{dto.userUnit} </if> <if test="dto.countyUnit != null and dto.countyUnit != ''"> and dria."county_cd"=#{dto.userUnit} </if> <if test="dto.roleUnit != null and dto.roleUnit != ''"> and userR.role_id=#{dto.roleUnit} </if> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -526,6 +526,8 @@ if(!user.getRoleId().equals("1811657352658042882")){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } searchDTO.setRoleUnit(Long.parseLong(user.getRoleId())); //searchDTO.setUserId(userId); @@ -571,6 +573,8 @@ if(!user.getRoleId().equals("1811657352658042882")){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } searchDTO.setRoleUnit(Long.parseLong(user.getRoleId())); @@ -652,6 +656,8 @@ //判断是不是县级建办 否的话就是监理单位下人员进行 if(!user.getRoleId().equals("1811657352658042882")){ searchDTO.setUserUnit(Long.parseLong(user.getDeptId())); }else{ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId())); } searchDTO.setRoleUnit(Long.parseLong(user.getRoleId())); // if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
