Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 4
Родитель
Сommit
e52ad110fa

+ 2 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -132,6 +132,8 @@ public class BaseController {
 			model.addAttribute("userName", TokenManager.getAdminToken().getName());
 			model.addAttribute("departmentId", TokenManager.getAdminToken().getDepartmentId());
 			model.addAttribute("isAdmin", true);
+			model.addAttribute("isSalesman", TokenManager.hasRole(AFTConstants.SALESMAN));
+
 		}
 	}
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -141,4 +141,7 @@ public interface AdminMapper {
 
     Admin selectGetSuper(String aid);
 
+    String getFinanceDep(String aid);
+
+    List<String> getLowerFinanceDep(String aid);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1022,4 +1022,11 @@
     from admin
     where  open_id= #{openid}
   </select>
+  <select id="getFinanceDep" resultType="java.lang.String">
+    select id from department where finance_id = #{aid}
+  </select>
+  <select id="getLowerFinanceDep" resultType="java.lang.String">
+    select b.id from admin a left join department b on a.id=b.finance_id
+    where a.superior_id = #{aid}
+  </select>
 </mapper>

+ 9 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -192,6 +192,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private PatentNewService	patentNewService;
 	@Autowired
 	private AsyncUtils	asyncUtils;
+	@Autowired
+	private PushOrderService pushOrderService;
 	
 	@Value(value = "${mobileRemindCodeTemplate}")
 	private String					mobileRemindCodeTemplate	= null;
@@ -560,6 +562,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
+		String url=pushOrderService.ShiroConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getApproval(),tOrder.getOrderDep());
+		logger.debug(url);
+		tOrder.setContractPictureUrl(url);
 		return tOrder;
 	}
 
@@ -1448,5 +1453,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-	
+
+
+
+
 }

+ 64 - 0
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -0,0 +1,64 @@
+package com.goafanti.order.service.impl;
+
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.core.shiro.token.TokenManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PushOrderService {
+    public static String   DEFAULTS_URL="/image/noPermission.jpg";
+
+    @Autowired
+    private AdminMapper adminMapper;
+
+    public  String  ShiroConstant(String url,String aid,Integer approval,String orderDep){
+        if (!url.isEmpty()){
+            if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
+                    TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
+                return url;
+            }else if (TokenManager.hasRole(AFTConstants.CED)){
+                if (approval==1){
+                    return url;
+                }else{
+                    return url;
+                }
+            }else if(TokenManager.hasRole(AFTConstants.FINANCE)){
+                String depId=adminMapper.getFinanceDep(TokenManager.getAdminId());
+                if (orderDep.equals(depId)){
+                    return url;
+                }else{
+                    return DEFAULTS_URL;
+                }
+            }else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
+                List<String> deps=adminMapper.getLowerFinanceDep(TokenManager.getAdminId());
+                boolean flag=false;
+                for (String dep : deps) {
+                    if (orderDep.equals(deps)){
+                        flag=true;
+                        break;
+                    }
+                    if (flag){
+                        return url;
+                    }else{
+                        return DEFAULTS_URL;
+                    }
+
+                }
+
+            } else if (TokenManager.hasRole(AFTConstants.SALESMAN)){
+                if (TokenManager.getAdminId().equals(aid)){
+                    return url;
+                }else{
+                    return DEFAULTS_URL;
+                }
+            }
+        }
+
+        return DEFAULTS_URL;
+    }
+}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -48,7 +48,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.91
+static.host=//static.jishutao.com/1.1.92
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -41,7 +41,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.91
+static.host=//static.jishutao.com/1.1.92
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload

+ 2 - 3
src/main/webapp/WEB-INF/views/common.html

@@ -354,8 +354,6 @@
 			globalConfig.avatarUploadHost = /*[[${avatarUploadHost}]]*/'';
 			globalConfig.csrfToken = /*[[${csrf}]]*/'';
 			globalConfig.kfqq = '2035994611';
-			window.userData = {};
-			window.adminData = {};
 			/*]]>*/
 		</script>
 		<script th:inline="javascript" th:if="${adminData!=null}">
@@ -368,7 +366,8 @@
 				uid : /*[[${adminData.id}]]*/'',
 				departmentId : /*[[${adminData.departmentId}]]*/'',
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
-				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false
+				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false,
+				isSalesman :/*[[${isSalesman}]]*/''
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;
 			window.showServices = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/services')}]]*/false;