[模版] 工作交接模版提交 bill3

c6d2022a · 133 · 91cba773 · c6d2022a · c6d2022a · c6d2022a
--- a/dev-union/src/main/resources/bill3.html
+++ b/dev-union/src/main/resources/bill3.html
 <!DOCTYPE html>
 <html lang="en">
-
+<!--工作交接-->
 <head>
    <meta charset="UTF-8" />
    <title>Document</title>
@@ -308,7 +308,7 @@
                        <div class="title">
                            <div class="main-title">
                                <span>
-                                    工作交接单2
+                                    工作交接单
                                </span>
                            </div>
                            <div style="width:100%;text-align:left;font-size: 1px;margin-bottom:2px">
@@ -389,7 +389,7 @@
                </div>
            </div>
        </div>
-        <p class="bottomTxt">第${page}页/共${count}页</p>
+        <p class="bottomTxt">第${page!}页/共${count!}页</p>
    </div>
    <!--<script type="text/javascript">-->
    <!--function altRows(id){-->

--- a/dev-user/pom.xml
+++ b/dev-user/pom.xml
@@ -35,10 +35,7 @@
            <artifactId>socket</artifactId>
        </dependency>

-        <!--<dependency>-->
-            <!--<groupId>com.tykj</groupId>-->
-            <!--<artifactId>dev-file</artifactId>-->
-        <!--</dependency>-->
+
        <dependency>
            <groupId>com.tykj.dev</groupId>
            <artifactId>blockcha</artifactId>

--- a/dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java
+++ b/dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java
@@ -4,6 +4,7 @@ import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.service.UnitsService;
+import com.tykj.dev.device.user.subject.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +14,11 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 * @author zjm
 * @version 1.0.0
@@ -29,6 +35,9 @@ public class UnitsController {
    @Autowired
    UnitsService unitsService;

+    @Autowired
+    UserService userService;
+
    @GetMapping(value = "/find/{unitsId}")
    @ApiOperation(value = "根据单位ID查询对象", notes = "返回单位对象")
    public ResponseEntity findUnits(@PathVariable Integer unitsId) {
@@ -53,6 +62,8 @@ public class UnitsController {
        return ResponseEntity.ok(unitsService.findLeftNavigation(securityUser));
    }

+
+
    @GetMapping(value = "/findAll/GreaterThanEqual/{level}")
    @ApiOperation(value = "根据当前用户的单位等级，查询所有的下级单位以及自己单位", notes = "单位集合")
    public ResponseEntity GreaterThanEqualLeven(@PathVariable Integer level) {