Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/report/ProdiodetailView.java

@@ -34,5 +34,7 @@ public class ProdiodetailView implements Serializable{
 
     private String pr_brand;
     private String pr_orispeccode;
+    private String creatorName;
+    private String pi_auditman;
 
 }

applications/storage/storage-server/src/main/resources/mapper/ProdInOutReportMapper.xml

@@ -23,6 +23,8 @@
     <result column="pd_whname" jdbcType="VARCHAR" property="pd_whname" />
     <result column="pr_brand" jdbcType="VARCHAR" property="pr_brand" />
     <result column="pr_orispeccode" jdbcType="VARCHAR" property="pr_orispeccode" />
+    <result column="creatorName" jdbcType="VARCHAR" property="creatorName" />
+    <result column="pi_auditman" jdbcType="VARCHAR" property="pi_auditman" />
   </resultMap>
 
 

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/mapper/RoleResourceMapper.java

@@ -67,7 +67,7 @@ public interface RoleResourceMapper {
      * 查询所有的ClassIfy
      * @return
      */
-    List<PowerInfo> selectPowerInfo();
+    List<PowerInfo> selectPowerInfo(@Param("condition") String condition);
 
     /**
      * 查询其他权限

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/RoleServiceImpl.java

@@ -7,6 +7,7 @@ import com.usoftchina.saas.account.po.*;
 import com.usoftchina.saas.account.service.ResourceService;
 import com.usoftchina.saas.account.service.RoleService;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.cache.ConfigsCache;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.CollectionUtils;
@@ -92,7 +93,12 @@ public class RoleServiceImpl extends CommonBaseServiceImpl<RoleMapper, Role> imp
     public List<PowerDTO> getResourcePowerById(Long id) {
         List<PowerDTO> powerDTOList = new ArrayList<PowerDTO>();
         List<Map<String, Object>> classifyList = roleResourceMapper.selectClassifyByRoleId(id);
-        List<PowerInfo> powerInfoList = roleResourceMapper.selectPowerInfo();
+        boolean enableB2B = ConfigsCache.current().enableB2B();
+        String condition = null;
+        if (!enableB2B){
+            condition = "s.is_b2b = 0";
+        }
+        List<PowerInfo> powerInfoList = roleResourceMapper.selectPowerInfo(condition);
         List<OtherPower> otherPowerList = roleResourceMapper.selectOthersPower();
         List<OtherPower> hasOtherPowerList = roleResourceMapper.selectOthersPowerByRoleId(id);
 

base-servers/account/account-server/src/main/resources/mapper/RoleResourceMapper.xml

@@ -34,11 +34,16 @@
     <select id="selectPowerInfo" parameterType="java.lang.Long" resultType="com.usoftchina.saas.account.po.PowerInfo">
         SELECT GROUP_CONCAT(classify) classify,group_id groupId,groupname,moduleId,modulename FROM (
           SELECT classify,group_id,s.name groupname,M.NAME modulename,M.id moduleId FROM AC_RESOURCE R
-				LEFT JOIN AC_RESOURCE_GROUP S ON R.GROUP_ID = S.ID
-				LEFT JOIN AC_RESOURCE_MODULE M ON S.MODULE_ID = M.ID
+          LEFT JOIN AC_RESOURCE_GROUP S ON R.GROUP_ID = S.ID
+          LEFT JOIN AC_RESOURCE_MODULE M ON S.MODULE_ID = M.ID
+          <where>
+            <if test="condition != null">
+              ${condition}
+            </if>
+          </where>
           GROUP BY GROUP_ID,CLASSIFY,s.name,M.NAME,M.id) A
         GROUP BY GROUP_ID,groupname,modulename,moduleId
-		ORDER BY MODULEID
+		    ORDER BY MODULEID
     </select>
     <resultMap id="OtherPowerResultMap" type="com.usoftchina.saas.account.po.OtherPower">
         <result column="name" property="name" jdbcType="VARCHAR" />

framework/core/src/main/java/com/usoftchina/saas/cache/RedisHashCache.java

@@ -30,7 +30,7 @@ public abstract class RedisHashCache<K, F, V> extends BaseRedisCache<K, V> {
         RedisTemplate redisTemplate = super.getRedisTemplate();
         redisTemplate.setHashKeySerializer(new StringRedisSerializer());
         redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer(Object.class));
-        return super.getRedisTemplate().boundHashOps(key());
+        return redisTemplate.boundHashOps(key());
     }
 
     public Set<F> keys() {

frontend/saas-web/app/view/main/MainController.js

@@ -66,7 +66,6 @@ Ext.define('saas.view.main.MainController', {
         mainLogo.animate({dynamic: true, duration: 500, to: {width: new_width}});
         Ext.fly(logoImg).animate({dynamic: true, duration: 500, to: newLogoImgStyle});
         Ext.fly(logoText).animate({dynamic: true, duration: 500, keyframes: newLogoTextStyle});
-        navigationList.body.animate({dynamic: true, duration: 500, to: {width: new_width}});
         navigationList.animate({dynamic: true, duration: 500, to: {width: new_width}});
 
         for(var i = 0; i < navItems.length; i++) {