Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -229,7 +229,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username);
 
     /**
-     * 更新有效无效状态
+     * 更新启用禁用
      * @return count
      */
     public int updateValidStatusById(ID id,int status,String username);

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -884,7 +884,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
                     + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
                     + propName + " in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
-            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             query.setParameter("modifyUser",username);
             query.setParameter("modifyDatetime",getNowTime(true));
             query.setParameter(propName, Arrays.asList(propValues));
@@ -908,7 +908,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             Query query = entityManager.createQuery(sb.toString());
             query.setParameter("modifyUser",username);
             query.setParameter("modifyDatetime",getNowTime(true));
-            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
             setParameter(query,propName,propValue);
 
@@ -934,7 +934,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
+     * 批量禁用
      * @return
      */
     @Override
@@ -956,7 +956,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
+     * 批量禁用
      * @return
      */
     @Override