bug修改

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -356,7 +356,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysDept sysDept = sysDeptService.get(deptId);
         List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum(sysXzqhService.getSubString(sysDept.getXzqhId()),user.getId(),user.getUserType());
         NumberDto numDto = new NumberDto();
-        if (dto.size() > 1) {
+        if (!dto.isEmpty()) {
         for (Num num : dto) {
             if (num.getName().equals("ms")) {
                 numDto.setMs(Integer.valueOf(num.getNum()));
@@ -365,7 +365,13 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 numDto.setZd(Integer.valueOf(num.getNum()));
             }
         }
-            numDto.setNum(Integer.parseInt(dto.get(0).getNum())+Integer.parseInt(dto.get(1).getNum()));
+        if (ObjectUtil.isEmpty(numDto.getZd())){
+            numDto.setZd(0);
+        }
+            if (ObjectUtil.isEmpty(numDto.getMs())){
+                numDto.setMs(0);
+            }
+            numDto.setNum(numDto.getMs()+numDto.getZd());
 
         }else {
             numDto.setNum(0);

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml

@@ -90,7 +90,6 @@
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by ${orderBy} desc
-
         </if>
         <if test="userType==00">
             <where>
@@ -106,7 +105,6 @@
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by ${orderBy} desc
-
         </if>
 
     </select>