device 增加 过滤 为删除条件 修复

fengxiang

2018-07-06 ff93ecd1f2cb4c5ae8459430dd3e09fedad0e3ea

device 增加 过滤 为删除条件 修复

 src/main/java/com/moral/common/util/ExampleUtil.java

@@ -139,7 +139,16 @@
            List<Example.Criteria> criteriaList = example.getOredCriteria();
            if(criteriaList!=null&&criteriaList.size()>0){
                for(Example.Criteria cri : criteriaList){
                    cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
                    boolean isHasIsDelete = false;
                    for(Example.Criterion con : cri.getCriteria()){
                          if( con.getCondition().indexOf("is_delete") >-1) {
                              isHasIsDelete = true;
                              break;
                          }
                    }
                    if( !isHasIsDelete) {
                        cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
                    }
                }
            }else {
                example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -346,7 +346,7 @@
    @Override

    public PageBean queryByPageBean(PageBean pageBean) {

        Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);

        addDeletesToExample(example);

//        addDeletesToExample(example);

        if(pageBean.getPageSize()>0){

            PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

        }