Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java

@@ -75,7 +75,7 @@ public class FeeConfigDto extends PageDto implements Serializable {
     private String statusCd = "0";
     private String computingFormulaText;
 
-    private String deductFrom = "Y";
+    private String deductFrom;
 
     private double amount;
 

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -1955,7 +1955,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         BigDecimal rateDec = null; //递增周期所收费用
         BigDecimal lastRateAmountDec = null;
         double curCycle = 0;
-        for (int cycleIndex = 0; cycleIndex < maxCycle; maxCycle++) {
+        for (int cycleIndex = 0; cycleIndex < maxCycle; cycleIndex++) {
             rateDec = preCycleAmount.multiply(new BigDecimal(rate)).setScale(2, BigDecimal.ROUND_HALF_UP);
             //增长周期的倍数
             curCycle = (cycleIndex + 1) * rateCycle;

service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -66,6 +66,10 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
             return rooms;
         }
 
+        if(rooms.size() > 50){
+            return rooms;
+        }
+
         String[] roomIds = getRoomIds(rooms);
         Map attrParamInfo = new HashMap();
         attrParamInfo.put("roomIds", roomIds);

service-user/src/main/java/com/java110/user/cmd/owner/ListAppUserBindingOwnersCmd.java

@@ -6,10 +6,14 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.file.FileRelDto;
 import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.workflowDataFile.WorkflowDataFileDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
@@ -32,6 +36,9 @@ public class ListAppUserBindingOwnersCmd extends Cmd {
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
@@ -94,7 +101,32 @@ public class ListAppUserBindingOwnersCmd extends Cmd {
             }
         }
 
+        List<String> ownerIds = new ArrayList<>();
+        for(OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos){
+            ownerIds.add(ownerAppUserDto.getMemberId());
+        }
+
+        if(ownerIds.size() < 1){
+            return;
+        }
+
+
+        FileRelDto fileRelDto = new FileRelDto();
+        fileRelDto.setObjIds(ownerIds.toArray(new String[ownerIds.size()]));
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
 
+        if(fileRelDtos == null || fileRelDtos.size() < 1){
+            return ;
+        }
+        String imgUrl = MappingCache.getValue("IMG_PATH");
+        for(OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos){
+            for(FileRelDto tmpFileRelDto : fileRelDtos){
+                if(!ownerAppUserDto.getMemberId().equals(tmpFileRelDto.getObjId())){
+                    continue;
+                }
+                ownerAppUserDto.setHeadImgUrl(imgUrl +tmpFileRelDto.getFileRealName() );
+            }
+        }
     }
 
     /**