fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/dao/OperateDeviceLevelDao.java

@@ -20,6 +20,6 @@ public interface OperateDeviceLevelDao {
 
     public OperateDeviceLevel get(long id);
 
-    public OperateDeviceLevel query(OperateDeviceLevel operateDeviceLevel);
+    public List<OperateDeviceLevel>  query(OperateDeviceLevel operateDeviceLevel);
 
 }

virgo.api/src/main/java/com/bosshand/virgo/api/operate/service/OperateDeviceLevelService.java

@@ -107,9 +107,15 @@ public class OperateDeviceLevelService {
         }
     }
 
-    public OperateDeviceLevel query(OperateDeviceLevel operateDeviceLevel) {
-        OperateDeviceLevel level = operateDeviceLevelDao.query(operateDeviceLevel);
-        return this.get(level.getId());
+    public List<OperateDeviceLevel> query(OperateDeviceLevel operateDeviceLevel) {
+        List<OperateDeviceLevel> list = new ArrayList<>();
+        List<OperateDeviceLevel> level = operateDeviceLevelDao.query(operateDeviceLevel);
+        if (level != null && level.size() > 0) {
+            for (OperateDeviceLevel od : level) {
+                list.add(this.get(od.getId()));
+            }
+        }
+        return list;
     }
 
 }

virgo.api/src/main/java/com/bosshand/virgo/api/service/PaymentService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bosshand.virgo.api.dao.*;
 import com.bosshand.virgo.api.model.*;
+import com.bosshand.virgo.core.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -76,13 +77,13 @@ public class PaymentService {
                     json.put("earnestMoneyType", clause.getEarnestMoneyType());
                     json.put("earnestMoney", clause.getEarnestMoney());
                     earnestMoneyArray.add(json);
-                    BigDecimal bigDecimal = new BigDecimal(clause.getEarnestMoney());
+                    BigDecimal bigDecimal = new BigDecimal(StringUtil.blank(clause.getEarnestMoney()) ? "0" : clause.getEarnestMoney());
                     earnestMoney = earnestMoney.add(bigDecimal);
                 } else {
                     json.put("earnestMoneyType", clause.getEarnestMoneyType());
                     json.put("earnestMoney", clause.getEarnestMoney());
                     earnestMoneyArray.add(json);
-                    earnestMoney = new BigDecimal(clause.getEarnestMoney());
+                    earnestMoney = new BigDecimal(StringUtil.blank(clause.getEarnestMoney()) ? "0" : clause.getEarnestMoney());
                     a = a + 1;
                 }
             }

virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectService.java

@@ -138,13 +138,12 @@ public class ProjectService {
 			return list;
 		}
 		// 项目管理员
+		Map<Long, Project> map = new HashMap();
 		if (userContext.isAdmin()) {
 			list = projectDao.getProjectByOrganizationId(userContext.getOrganizationId());
 			if (list != null && list.size() > 0) {
-				Set<JSONObject> set = new HashSet<>();
-				set.add(JSONObject.parseObject(UserContext.IDENTITY_OWNER_DATA));
 				for (Project project : list) {
-					project.setProjectListIdentity(set);
+					map.put(project.getId(), project);
 				}
 			}
 		}
@@ -158,9 +157,19 @@ public class ProjectService {
 			if (list.size() > 0) {
 				List<Project> ls = getIds(ids);
 				for (Project project : ls) {
-					project.setProjectListIdentity(projectListIdentity.get(project.getId()));
+					Set<JSONObject> jsonObjects = projectListIdentity.get(project.getId());
+					if(map.containsKey(project.getId())){
+						jsonObjects.add(JSONObject.parseObject(UserContext.IDENTITY_OWNER_DATA));
+					}
+					project.setProjectListIdentity(jsonObjects);
+				}
+				for (Project project : ls) {
+					Set<JSONObject> jsonObjects = projectListIdentity.get(project.getId());
+					if(map.containsKey(project.getId())){
+						jsonObjects.add(JSONObject.parseObject(UserContext.IDENTITY_OWNER_DATA));
+					}
+					project.setProjectListIdentity(jsonObjects);
 				}
-				ls.addAll(list);
 				return ls;
 			}
 			list = getIds(ids);