针对MySQL特别处理

huigou-core-impl/src/main/java/com/huigou/uasp/bmp/opm/impl/OrgApplicationImpl.java

 package com.huigou.uasp.bmp.opm.impl;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.Assert;
-
 import com.huigou.cache.SystemCache;
 import com.huigou.context.MessageSourceContext;
 import com.huigou.context.Operator;
@@ -33,36 +20,23 @@ import com.huigou.uasp.bmp.opm.SelectOrgScope;
 import com.huigou.uasp.bmp.opm.application.OrgApplication;
 import com.huigou.uasp.bmp.opm.application.PermissionBuilder;
 import com.huigou.uasp.bmp.opm.domain.model.access.Role;
-import com.huigou.uasp.bmp.opm.domain.model.org.Org;
-import com.huigou.uasp.bmp.opm.domain.model.org.OrgNodeData;
-import com.huigou.uasp.bmp.opm.domain.model.org.OrgNodeKind;
-import com.huigou.uasp.bmp.opm.domain.model.org.OrgProperty;
-import com.huigou.uasp.bmp.opm.domain.model.org.OrgPropertyDefinition;
-import com.huigou.uasp.bmp.opm.domain.model.org.OrgTemplate;
-import com.huigou.uasp.bmp.opm.domain.model.org.OrgType;
+import com.huigou.uasp.bmp.opm.domain.model.org.*;
 import com.huigou.uasp.bmp.opm.domain.model.org.OrgType.OrgKind;
-import com.huigou.uasp.bmp.opm.domain.model.org.Person;
-import com.huigou.uasp.bmp.opm.domain.model.org.Tenant;
 import com.huigou.uasp.bmp.opm.domain.query.OrgDesc;
 import com.huigou.uasp.bmp.opm.domain.query.OrgPropertyDefinitionQueryRequest;
 import com.huigou.uasp.bmp.opm.domain.query.OrgQueryModel;
-import com.huigou.uasp.bmp.opm.repository.org.OrgPropertyDefinitionRepository;
-import com.huigou.uasp.bmp.opm.repository.org.OrgRepository;
-import com.huigou.uasp.bmp.opm.repository.org.OrgTemplateRepository;
-import com.huigou.uasp.bmp.opm.repository.org.OrgTypeRepository;
-import com.huigou.uasp.bmp.opm.repository.org.PersonRepository;
-import com.huigou.uasp.bmp.opm.repository.org.RoleRepository;
+import com.huigou.uasp.bmp.opm.repository.org.*;
 import com.huigou.uasp.bmp.securitypolicy.application.SecurityPolicyApplication;
 import com.huigou.uasp.bmp.securitypolicy.domain.model.PersonAccount;
 import com.huigou.uasp.bmp.securitypolicy.domain.model.PersonAccount.PersonAccountStatus;
 import com.huigou.uasp.bmp.securitypolicy.domain.model.SecurityPolicy;
-import com.huigou.util.ClassHelper;
-import com.huigou.util.CommonUtil;
-import com.huigou.util.Constants;
-import com.huigou.util.Md5Builder;
-import com.huigou.util.StringPool;
-import com.huigou.util.StringUtil;
-import com.huigou.util.Util;
+import com.huigou.util.*;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
 
 public class OrgApplicationImpl extends BaseApplication implements OrgApplication {
 
@@ -261,16 +235,11 @@ public class OrgApplicationImpl extends BaseApplication implements OrgApplicatio
 
         }
         if (StringUtils.isNotBlank(sql)) {
-            // @since 1.3.3
-            List<String> psmIds = this.generalRepository.queryByNativeSql(sql, params)
-                    .stream()
-                    .map(Map.class::cast)
-                    .map(row -> (String) row.get("id"))
-                    .collect(Collectors.toList());
+            // @since 1.3.3，专门针对MySQL的处理
+            List<String> psmIds = (List<String>) this.generalRepository.queryByNativeSql(sql, params);
             for (String psmId : psmIds) {
                 Org psm = orgRepository.findOne(psmId);
                 psm.setStatus(toStatus.getId());
-                psm.setVersion(generalRepository.getVersionNextId());
                 orgRepository.save(psm);
             }
         } else {