接口修改

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/controller/GwCirculationCard2Controller.java

@@ -83,7 +83,7 @@ public class GwCirculationCard2Controller {
 	@ApiOperation(value = "查询公文流转列表数据（含待办筛选）")
 	@PreAuthorize("hasAuthority('circulation2:gwCirculationCard2:list')")
 	@GetMapping("list2")
-	public ResponseEntity<IPage<GwCirculationCard2DTO>> list2(GwCirculationCard2DTO gwCirculationCard2DTO, Page<GwCirculationCard2DTO> page) throws Exception {
+	public ResponseEntity<IPage<GwCirculationCard2DTO>> list2(GwCirculationCard2DTO gwCirculationCard2DTO, Page<GwCirculationCard2> page) throws Exception {
 		//除   管理员、办公室管理员  之外的角色需要判断是否涉及自己流程
 		UserDTO userDTO=UserUtils.getCurrentUserDTO();
 		List<RoleDTO> list=userDTO.getRoleDTOList();
@@ -100,17 +100,21 @@ public class GwCirculationCard2Controller {
 //			result = gwCirculationCard2Wrapper.toDTO ( gwCirculationCard2Service.page (page, queryWrapper) );
 //		}else{
 			//
-			GwCirculationCard2DTO gwCirculationCard2DTO2=new GwCirculationCard2DTO();
-			QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (gwCirculationCard2DTO2, GwCirculationCard2DTO.class);
-
+			String state=gwCirculationCard2DTO.getState();
+			gwCirculationCard2DTO.setState("");
+			QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (gwCirculationCard2DTO, GwCirculationCard2DTO.class);
 
 			queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
 			queryWrapper.eq ("b.del_flag", 0 ); // 排除已经删除
-			queryWrapper.eq ("b.update_by_id", userDTO.getId() );
-			if(gwCirculationCard2DTO.getState()!=null&&!gwCirculationCard2DTO.getState().equals("null")&&!gwCirculationCard2DTO.getState().equals("")){
-				queryWrapper.ne ("a.state", gwCirculationCard2DTO.getState() );
-				if(!gwCirculationCard2DTO.getState().equals("1")){
-					queryWrapper.ne ("b.state", gwCirculationCard2DTO.getState() );
+
+			if(!isadmin){
+				queryWrapper.eq ("b.update_by_id", userDTO.getId() );
+			}
+
+			if(state!=null&&!state.equals("null")&&!state.equals("")){
+				queryWrapper.eq ("a.state", state );
+				if(!state.equals("1")){
+					queryWrapper.eq ("b.state", state );
 				}
 			}
 			queryWrapper.groupBy("a.id");

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/mapper/GwCirculationCard2Mapper.java

@@ -21,6 +21,6 @@ public interface GwCirculationCard2Mapper extends BaseMapper<GwCirculationCard2>
 
     int saveGetId(GwCirculationCard2DTO map);
 
-    IPage<GwCirculationCard2DTO> findList(Page<GwCirculationCard2DTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+    IPage<GwCirculationCard2DTO> findList(Page<GwCirculationCard2> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
 }

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/service/GwCirculationCard2Service.java

@@ -36,9 +36,8 @@ public class GwCirculationCard2Service extends ServiceImpl<GwCirculationCard2Map
      * @param queryWrapper
      * @return
      */
-    public IPage<GwCirculationCard2DTO> findPage(Page<GwCirculationCard2DTO> page, QueryWrapper queryWrapper) {
+    public IPage<GwCirculationCard2DTO> findPage(Page<GwCirculationCard2> page, QueryWrapper queryWrapper) {
 
-        System.err.println( queryWrapper.getCustomSqlSegment() );
         return  baseMapper.findList (page, queryWrapper);
     }
 

jp-ui/src/views/circulation2/GwCirculationCard2List.vue

@@ -243,7 +243,7 @@
 		    total: 0,
 		    currentPage: 1,
 		    pageSize: 10,
-		    orders: [{ column: "create_time", asc: false }],
+		    orders: [{ column: "a.create_time", asc: false }],
 		  },
 		  loading: false
 		}