Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/model/vo/CostIncomeGroupSetVO.java

@@ -31,7 +31,7 @@ public class CostIncomeGroupSetVO {
 
     @ApiModelProperty(name = "responsibilityCode",value = "责任中心的代码")
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
-    private String responsibilityCode;
+    private String responsibilityCodes;
 
     @ApiModelProperty(name = "responsibilityName",value = "责任中心的名称")
     @JsonInclude(value = JsonInclude.Include.NON_NULL)

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupSetServiceImpl.java

@@ -64,7 +64,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
         if (!CollectionUtils.isEmpty(responsibilityList)) {
             final Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
             costIncomeGroupSetVOList.forEach(i -> {
-                String responsibilityCode = i.getResponsibilityCode();
+                String responsibilityCode = i.getResponsibilityCodes();
                 if (!StringUtils.isEmpty(responsibilityCode)){
                     List<String> responsibilityCodeList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
                     if (CollectionUtils.isEmpty(responsibilityCodeList)) {
@@ -102,7 +102,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
                 .eq(Responsibility::getHospId, hospId));
         if (!CollectionUtils.isEmpty(responsibilityList)) {
             Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
-            String responsibilityCode = costIncomeGroupSetVO.getResponsibilityCode();
+            String responsibilityCode = costIncomeGroupSetVO.getResponsibilityCodes();
             if (!StringUtils.isEmpty(responsibilityCode)) {
                 List<String> asList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
                 if (!CollectionUtils.isEmpty(asList)){

src/main/java/com/imed/costaccount/service/impl/RoleServiceImpl.java

@@ -65,9 +65,14 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      */
     @Override
     public PageUtils selectList(Integer page, Integer pageSize, String keyword, User user, String modifyTime) {
-        DateTime modifyDate = DateUtil.parseDate(modifyTime);
-        long startTime = DateUtil.beginOfDay(modifyDate).getTime();
-        long endTime = DateUtil.endOfDay(modifyDate).getTime();
+        long startTime=0L;
+        long endTime=0L;
+        if (StrUtil.isNotBlank(modifyTime)){
+            DateTime modifyDate = DateUtil.parseDate(modifyTime);
+            startTime = DateUtil.beginOfDay(modifyDate).getTime();
+            endTime = DateUtil.endOfDay(modifyDate).getTime();
+        }
+
         Page<Role> rolePage = new Page<>(page, pageSize);
         Page<Role> pages = this.page(rolePage,
                 new LambdaQueryWrapper<Role>().eq(Role::getHospId, user.getHospId())