投资效益系统-bug修改

src/main/java/org/springblade/modules/investment/controller/IbaProjectController.java

@@ -4,6 +4,7 @@ package org.springblade.modules.investment.controller;
 import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.investment.pojo.entity.IbaProject;
 import org.springblade.modules.investment.pojo.entity.IbaProjectVolume;
 import org.springblade.modules.investment.pojo.query.IbaProjectIncomeQuery;
@@ -64,6 +65,12 @@ public class IbaProjectController {
      */
     @PostMapping("/add")
     public R<IbaProject> add(@RequestBody IbaProject ibaProject) {
+        if(StringUtil.isBlank(ibaProject.getProjectName())){
+            return R.fail("项目名称不能为空");
+        }
+        if(StringUtil.isBlank(ibaProject.getOperationCompany())){
+            return R.fail("公司不能为空");
+        }
         return R.status(this.ibaProjectService.insert(ibaProject));
     }
 

src/main/java/org/springblade/modules/investment/mapper/IbaProjectMapper.xml

@@ -130,7 +130,7 @@
                     a.id,
                     a.project_name,
                     a.operation_company ,
-                    IFNULL(( b.toll_inflow + b.other_inflow ), 0 ) inflow
+                    IFNULL(( sum(b.toll_inflow) + sum(b.other_inflow) ), 0 ) inflow
                 FROM
                     iba_project a
                         LEFT JOIN iba_project_fund b ON a.id = b.project_id and b.is_deleted = 0

src/main/java/org/springblade/modules/investment/pojo/entity/IbaProject.java

@@ -9,6 +9,7 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.modules.investment.pojo.dto.IbaProjectVolumeDTO;
 

src/main/java/org/springblade/modules/system/controller/RoleController.java

@@ -169,8 +169,9 @@ public class RoleController extends BladeController {
         CacheUtil.clear(SYS_CACHE);
         CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
         List<Long> roleIds = grantVO.getRoleIds();
-        if (roleIds != null && Func.isNull(roleIds.get(0))) {
+        if (roleIds != null) {
             Role role = new Role();
+            role.setId(roleIds.get(0));
             role.setParentId(0L);
             role.setRoleName(grantVO.getRoleName());
             if (grantVO.getSystemType() != null) {

src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java

@@ -208,7 +208,12 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
 			role.setTenantId(parent.getTenantId());
 		}
 		role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
-		return saveOrUpdate(role);
+			if(role.getId()!=null){
+            baseMapper.updateById(role);
+		}else{
+            baseMapper.insert(role);
+        }
+        return true;
 	}
 
 	@Override