Merge remote-tracking branch 'origin/dev_hjj_522'

src/main/java/com/jsh/erp/service/FunctionService.java

@@ -78,10 +78,8 @@ public class FunctionService {
     public List<FunctionEx> select(String name, String type)throws Exception {
         List<FunctionEx> list=null;
         try{
-            if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) {
                 PageUtils.startPage();
                 list = functionMapperEx.selectByConditionFunction(name, type);
-            }
         }catch(Exception e){
             JshException.readFail(logger, e);
         }