--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/bg/organ/controller/OrganController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -26,8 +27,10 @@ import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.member.bg.organ.QueryOrganForm;
 import com.zrqx.core.form.member.bg.organ.SaveOrUpdateOrganForm;
+import com.zrqx.core.form.resource.bg.diytype.SaveDiyTypeForm;
 import com.zrqx.core.model.member.Organ;
 import com.zrqx.core.model.resource.diytype.DiyType;
+import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -56,7 +59,7 @@ public class OrganController {
 			Organ entity = new Organ();
 			BeanUtils.copyProperties(organ, entity);
 			entity.setCreateTime(new Date());
-			entity.setRelatedResourceTypes("");
+			entity.setRelatedResourceTypes(this.getRelatedResourceTypes(organ));
 			entity.setCreater(redis.getUser().getUserName());
 			if (!service.insert(entity)) {
 				throw new BaseException(ResponseCodeEnum.FAIL);
@@ -64,11 +67,8 @@ public class OrganController {
 		}else {
 			Organ entity = service.selectByPrimaryKey(organ.getId());
 			BeanUtils.copyProperties(organ, entity);
-			entity.setRelatedResourceTypes(null);
+			entity.setRelatedResourceTypes(this.getRelatedResourceTypes(organ));
 			entity.setUpdater(redis.getUser().getUserName());
-			if(StringUtils.isNotBlank(organ.getRelatedResourceTypes())){	
-				entity.setRelatedResourceTypes(organ.getRelatedResourceTypes());
-			}
 			entity.setUpdateTime(new Date());
 			if (!service.updateByPrimaryKey(entity)) {
 				throw new BaseException(ResponseCodeEnum.FAIL);
@@ -148,4 +148,23 @@ public class OrganController {
 		PageHelper.orderBy("createTime desc");
 		return CallBack.success(service.selectAll());
 	}
+	
+	/**
+	 * 获取资源权限分类code
+	 * @param organ
+	 * @return
+	 * @author ycw
+	 * @date: 2019年8月7日 上午10:12:44
+	 */
+	private String getRelatedResourceTypes(SaveOrUpdateOrganForm organ){
+		if(StringUtils.isBlank(organ.getRelatedResourceTypes())) {
+			List<SaveDiyTypeForm> list = organ.getDiyTypeCode();
+			if(ArrayUtils.isNotEmpty(list)){
+				String str = list.stream().map(SaveDiyTypeForm :: getCode).filter(li -> StringUtils.isNotBlank(li)).collect(Collectors.joining(","));
+				return str;
+			}
+			return null;
+		}
+		return organ.getRelatedResourceTypes();
+	}
 }